update0002

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -1625,9 +1625,11 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		if (storageBill1 == null) {
 			return Result.error("装运单不存在，确认支数时间失败！");
 		}
-
+//		if (storageBillUpdateVo.getUpdateType() == 1){
+//			storageBill1.setAmountTotal(storageBillUpdateVo.getAmountTotal());
+//		}
 		if (storageBillUpdateVo.getUpdateType() == 1){
-			storageBill1.setAmountTotal(storageBillUpdateVo.getAmountTotal());
+			storageBill1.setPanelAmountTotal(storageBillUpdateVo.getPanelAmountTotal());
 		}
 		storageBill1.setConfirmNumTime(new Date());
 		storageBillService.updateById(storageBill1);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/StorageBill.java

@@ -196,4 +196,9 @@ public class StorageBill implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "确认支数时间")
     private Date confirmNumTime;
+
+    /**总支数*/
+    @Excel(name = "看板总支数", width = 15)
+    @ApiModelProperty(value = "看板总支数")
+    private Integer panelAmountTotal;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/StorageBillUpdateVo.java

@@ -5,6 +5,6 @@ import lombok.Data;
 @Data
 public class StorageBillUpdateVo {
     private String id;
-    private Integer amountTotal;
+    private Integer panelAmountTotal;
     private Integer updateType;
 }