Merge branch 'master' of http://123.57.213.14:3001/zgzt/dosb-java

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

@@ -1340,6 +1340,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		}
 
 		// 更新当前时间为装运单 炼钢到达时间
+		storageBill1.setArriveNum(storageBill.getArriveNum());
 		storageBill1.setSteelReachTime(new Date());
 		storageBillService.updateById(storageBill1);
 		return Result.OK("炼钢到达时间确认成功!");

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

@@ -174,6 +174,10 @@ public class StorageBill implements Serializable {
     @ApiModelProperty(value = "炼钢到达时间")
     private Date steelReachTime;
 
+    /**车号*/
+    @Excel(name = "卸货目的地（一体机）", width = 15)
+    @ApiModelProperty(value = "卸货目的地（一体机）")
+    private Integer arriveNum;
     /**
      * 牌号
      */