update

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -864,6 +864,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		storageBill.setCarNum(oConvertUtils.listIsEmpty(storageBillList) ? 0 : storageBillList.size() + 1);// 本车车次
 		storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
 		storageBill.setDestination(billetHotsendTypeConfig.getTypeName());// 目的地
+		storageBill.setAmountTotal(rollClubCommonList.size());
 		storageBill.setOutTime(new Date());
 		storageBillService.updateById(storageBill);
 		// 生成储运单

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -620,6 +620,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         storageBill.setCarNum(oConvertUtils.listIsEmpty(storageBillList) ? 0 : storageBillList.size() + 1);// 本车车次
         storageBill.setTypeConfigId(loadingParams.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
         storageBill.setDestination(billetHotsendTypeConfig.getTypeName());// 目的地
+        storageBill.setAmountTotal(stackingAndLoadingVehiclesList.size() * 4);
         storageBill.setOutTime(new Date());
         storageBillService.updateById(storageBill);
         // 7 发车后，新增钢坯堆垛储运信息,生成储运单 storage_car_log

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

@@ -12,6 +12,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsendDetailsVo;
 import org.jeecg.modules.billet.operateLog.service.IOperateLogService;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
@@ -79,6 +80,11 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 	 @ApiOperation(value="钢坯装运单-添加", notes="钢坯装运单-添加")
 	 @PostMapping(value = "/add")
 	 public Result<String> add(@RequestBody StorageBill storageBill) {
+		 storageBill.setCarAllNum(oConvertUtils.listIsEmpty(storageBillService.list()) ? 0 : storageBillService.list().size() + 1);// 车次总序号
+		 storageBill.setDateTime(new Date());// 日期
+		 storageBill.setArrivalTime(new Date());// 到达时间
+		 storageBill.setCarNum(0);
+		 storageBill.setAmountTotal(oConvertUtils.isEmpty(storageBill.getAmountTotal()) ? 0 : storageBill.getAmountTotal());
 		 storageBillService.save(storageBill);
 		 operateLogService.add(storageBill,null,StorageBill.class);
 		 return Result.OK("添加成功！");

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

@@ -60,7 +60,9 @@ public class StorageBill implements Serializable {
     /**日期*/
     @Excel(name = "日期", width = 15)
     @ApiModelProperty(value = "日期")
-    private String dateTime;
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date dateTime;
     /**铸机*/
     @Excel(name = "铸机", width = 15)
     @ApiModelProperty(value = "铸机")
@@ -125,11 +127,6 @@ public class StorageBill implements Serializable {
     @ApiModelProperty(value = "本车车次")
     private Integer carNum;
 
-    /**备注*/
-    @Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-
     /**备注*/
     @Excel(name = "目的地", width = 15)
     @ApiModelProperty(value = "目的地")
@@ -139,4 +136,10 @@ public class StorageBill implements Serializable {
     @ApiModelProperty(value = "钢坯配置类型ID")
     private String typeConfigId;
 
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
 }