Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

master_hella
gaojs 10 hours ago
parent
commit
3daeff4410
  1. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java
  2. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceRespVO.java

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java

@ -101,6 +101,7 @@ public class BalanceController {
vo.setItemType(itembasicDO.getType());
vo.setItemDesc1(itembasicDO.getDesc1());
vo.setItemDesc2(itembasicDO.getDesc2());
vo.setEnableBuy(itembasicDO.getEnableBuy());
}
}
return success(result);
@ -235,6 +236,7 @@ public class BalanceController {
vo.setItemType(itembasicDO.getType());
vo.setItemDesc1(itembasicDO.getDesc1());
vo.setItemDesc2(itembasicDO.getDesc2());
vo.setEnableBuy(itembasicDO.getEnableBuy());
}
}
return success(result);

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceRespVO.java

@ -3,6 +3,7 @@ package com.win.module.wms.controller.balance.vo;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.sun.xml.bind.v2.TODO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -30,4 +31,11 @@ public class BalanceRespVO extends BalanceBaseVO {
private String creator;
private BigDecimal totalQty;
/**
* 可采购
*
* 枚举 {@link TODO true_false 对应的类}
*/
private String enableBuy;
}

Loading…
Cancel
Save