物料同步字段不全调整

易文鹏
1 parent 6d9c743d
Showing 9 changed files with 203 additions and 67 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
src/main/java/com/huaheng/pc/config/material/domain/Material.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/monitor/job/util/ScheduleRunnable.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
src/main/resources/templates/monitor/job/job.html
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -349,28 +349,68 @@ public class MesReceiptController extends BaseController {
             // String sql = "SELECT * FROM [dbo].[sys_user] WHERE createTime > (select DATEADD(HOUR,-3,getdate())) AND createTime <= (select GETDATE())";
             // String sql = "SELECT * FROM [dbo].[base_material]  WHERE MaterialName = 'SMLS Pipe'";
             // 获取新增一天以内和修改两个小时以内的物料数据
-            String sql = "select a.cInvCode, a.cInvName, b.cidefine6, b.cidefine7, c.cComUnitName from [dbo].[Inventory] a left join [dbo].[Inventory_extradefine] b on a.cInvCode = b.cInvCode LEFT JOIN [dbo].[ComputationUnit] c ON a.cComUnitCode = c.cComunitCode WHERE (datediff(day,a.dSDate,getdate())=0 OR a.dModifyDate >=  DATEADD(HOUR, -4, GETDATE()))  and  a.cDefWareHouse in ('035','003')";
+            //String sql = "select a.cInvCode, a.cInvName, b.cidefine6, b.cidefine7, c.cComUnitName from [dbo].[Inventory] a left join [dbo].[Inventory_extradefine] b on a.cInvCode = b.cInvCode LEFT JOIN [dbo].[ComputationUnit] c ON a.cComUnitCode = c.cComunitCode WHERE (datediff(day,a.dSDate,getdate())=0 OR a.dModifyDate >=  DATEADD(HOUR, -4, GETDATE()))  and  a.cDefWareHouse in ('035','003')";
+            String sql="SELECT\n" +
+                    "\ta.cinvcode,\n" +
+                    "\ta.cinvname,\n" +
+                    "\ta.cDefWareHouse,\n" +
+                    "\ta.cComUnitCode,\n" +
+                    "\tb.cComUnitName,\n" +
+                    "\tc.cidefine6,\n" +
+                    "\tc.cidefine7,\n" +
+                    "\ta.dModifyDate,\n" +
+                    "\ta.dSDate,\n" +
+                    "\ta.cinvstd,\n" +
+                    "\ta.Iinvweight,\n" +
+                    "\ta.cinvccode,\n" +
+                    "\td.cInvCName\n" +
+                    "FROM\n" +
+                    "\t[dbo].[Inventory] a\n" +
+                    "\tLEFT JOIN [dbo].[ComputationUnit] b  ON a.cComUnitCode= b.cComUnitCode\n" +
+                    "\tLEFT JOIN [dbo].[Inventory_extradefine] c ON a.cinvcode= c.cinvcode\n" +
+                    "\tLEFT JOIN [dbo].[InventoryClass] d on a.cinvccode= d.cinvccode \n" +
+                    "WHERE ( datediff( DAY, a.dSDate, getdate( ) ) = 0 OR a.dModifyDate >= DATEADD( HOUR, - 4, GETDATE( ) ) ) \n" +
+                    "\tAND a.cDefWareHouse IN ( '035', '003' )" ;
+
             ResultSet resultSet = SqlServer.find(sql);
             if (resultSet == null){
                 return materialList;
             }
             while(resultSet.next()){
                 // 字段要与海王表一致
-                String code = resultSet.getString("cInvCode");
-                String name = resultSet.getString("cInvName");
-                String unit = resultSet.getString("cComUnitName");
-                String spec = resultSet.getString("cidefine6");
-                String high = resultSet.getString("cidefine7");
+                String code = resultSet.getString("cInvCode");//物料编码
+                String name = resultSet.getString("cInvName");//物料名称
+                String unitName = resultSet.getString("cComUnitName");//单位名称
+                String physicalDimension = resultSet.getString("cidefine6");//外形尺寸
+                String high = resultSet.getString("cidefine7");//托盘类型
+
+                String defWareHouse = resultSet.getString("cDefWareHouse");//u8仓库
+                String unitCode = resultSet.getString("cComUnitCode");//单位编码
+                //String modifyDate = resultSet.getString("dModifyDate");//修改时间
+                //String startDate = resultSet.getString("dSDate");//启用时间
+                String spec = resultSet.getString("cinvstd");//规格
+                String weight = resultSet.getString("Iinvweight");//重量cinvccode
+                String cinvccode = resultSet.getString("cinvccode");//存货类别编码
+                String cInvCName = resultSet.getString("cInvCName");//存货类别名称
                 int isHigh = "高托".equals(high) ? 1 : 0;
  
                 Material material = new Material();
                 material.setCode(code);
                 material.setName(name);
-                material.setUnit(unit);
+                material.setUnit(unitName);
                 material.setSpec(spec);
                 material.setIsHigh(isHigh);
                 material.setWarehouseCode("CS0001");
                 material.setCompanyCode("BHF");
+
+                material.setPhysicalDimension(physicalDimension);
+                material.setDefWareHouse(defWareHouse);
+                material.setUnitCode(unitCode);
+                //material.setModifyDate();
+                //material.setStartDate();
+                material.setWeight(weight);
+                material.setCinvccode(cinvccode);
+                material.setCInvCName(cInvCName);
                 materialList.add(material);
             }
             // materialService.saveBatch(materialList);
@@ -580,7 +620,7 @@ public class MesReceiptController extends BaseController {
         json.put("data", dataArray);
         ReturnInfo returnInfo = postMOM(action, json,"出库回传");
         shipmentHeader.setPushErrorCount(shipmentHeader.getPushErrorCount()+1);
-        if(returnInfo.getCode()==200) {
+        if (returnInfo !=null && returnInfo.getCode()==200) {
             shipmentHeader.setPushSuccessStatus(1);
             shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
             shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
@@ -8,6 +8,7 @@ import com.huaheng.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
  
@@ -312,8 +313,6 @@ public class Material implements Serializable {
     /** 打印机名称 */
     //    private static final  String printName = "Gprinter GP-1424D";
  
-
-
     /** */
     @TableField(value = "isHigh")
     @ApiModelProperty(value = "是否高托")
@@ -325,4 +324,52 @@ public class Material implements Serializable {
     @TableField(value = "materialAreaCode")
     private String materialAreaCode;
  
+    /**
+     * 外形尺寸
+     */
+    @TableField(value = "physicalDimension")
+    private String physicalDimension;
+
+    /**
+     * u8仓库
+     */
+    @TableField(value = "defWareHouse")
+    private String defWareHouse;
+
+    /**
+     * 单位编码
+     */
+    @TableField(value = "unitCode")
+    private String unitCode;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "modifyDate")
+    private Date modifyDate;
+
+    /**
+     * 启用时间
+     */
+    @TableField(value = "startDate")
+    private Date startDate;
+
+    /**
+     * 重量
+     */
+    @TableField(value = "weight")
+    private String weight;
+
+    /**
+     * 存货类别编码
+     */
+    @TableField(value = "cinvccode")
+    private String cinvccode;
+
+    /**
+     * 存货类别名称
+     */
+    @TableField(value = "cInvCName")
+    private String cInvCName;
+
 }
@@ -196,7 +196,6 @@ public class RyTask extends BaseController {
                 receiptHeader.setPushErrorCount(receiptHeader.getPushErrorCount()+1);
                 try{
                     ReturnInfo returnInfo = mesReceiptController.postOther_E_Rd_In(receiptDetailList, receiptHeader);
-
                     if (returnInfo !=null && returnInfo.getCode()==200) {
                         receiptDetailList.forEach( e -> e.setProcessStamp(QuantityConstant.RECEIPT_HEADER_RETURN+""));
                         receiptDetailService.updateBatchById(receiptDetailList);
@@ -205,6 +204,7 @@ public class RyTask extends BaseController {
                         receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
                         receiptHeader.setPushSuccessStatus(1);
                     }else{
+                        receiptHeader.setErrorMsg(returnInfo.getMsg());
                         receiptHeader.setPushSuccessStatus(2);
                     }
                     receiptHeaderService.updateById(receiptHeader);
@@ -367,11 +367,27 @@ public class RyTask extends BaseController {
      * 同步物料接口
      */
     public void synItems(){
-        System.out.println("开始同步物料");
         MesReceiptController MesReceiptController = new MesReceiptController();
         List<Material> materialList = MesReceiptController.getMaterial();
-        if (materialList != null)
-            materialService.saveOrUpdateBatch(materialList);
+        List<Material> saveMaterials = new ArrayList<>();
+        List<Material> updateMaterials = new ArrayList<>();
+
+        if (materialList != null && materialList.size() > 0) {
+            for (Material material : materialList) {
+                Material one = materialService.getOne(new LambdaQueryWrapper<Material>().eq(Material::getCode, material.getCode()));
+                if (one==null) {
+                    saveMaterials.add(material);
+                }else {
+                    updateMaterials.add(material);
+                }
+            }
+            if (saveMaterials.size()>0) {
+                materialService.saveBatch(saveMaterials);
+            }
+            if (updateMaterials.size()>0) {
+                materialService.updateBatchById(updateMaterials);
+            }
+        }
     }
  
     /**
@@ -8,12 +8,11 @@ import java.lang.reflect.Method;
  
 /**
  * 执行定时任务
- * 
+ *
  * @author huaheng
  *
  */
-public class ScheduleRunnable implements Runnable
-{
+public class ScheduleRunnable implements Runnable {
     private Object target;
     private Method method;
     private String params;
@@ -101,28 +101,44 @@ public class ShipmentHeaderController extends BaseController {
 	@Log(title = "出库-出库单", operating="查看出库主单", action = BusinessType.GRANT)
 	@PostMapping("/list")
 	@ResponseBody
-	public TableDataInfo list(ShipmentHeader shipmentHeader,String createdBegin, String createdEnd,String deliveryDate)
-	{
+	public TableDataInfo list(ShipmentHeader shipmentHeader,String createdBegin, String createdEnd,String deliveryDate,String startDate) {
 		LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
 		PageDomain pageDomain = TableSupport.buildPageRequest();
 		Integer pageNum = pageDomain.getPageNum();
 		Integer pageSize = pageDomain.getPageSize();
-		Date date = null;
+		Date date1 = null;
+		Date date2 = null;
 		try {
 			if (StringUtils.isNotNull(deliveryDate)) {
-				date = new SimpleDateFormat("yyyy-MM-dd").parse(deliveryDate);
+				date1 = new SimpleDateFormat("yyyy-MM-dd").parse(deliveryDate);
 			}else {
-				date = null;
+				date1 = null;
 			}
 		} catch (java.text.ParseException e) {
 			//LOGGER.error("时间转换错误, string = {}", deliveryDate, e);
 		}
  
-		Date startTime = date;
-		Date endTime = null;
-		if(startTime!=null){
+		try {
+			if (StringUtils.isNotNull(startDate)) {
+				date2 = new SimpleDateFormat("yyyy-MM-dd").parse(startDate);
+			}else {
+				date2 = null;
+			}
+		} catch (java.text.ParseException e) {
+		}
+
+		Date startTime1 = date1;
+		Date endTime1 = null;
+		if(startTime1!=null){
+			//获取当前时间
+			endTime1 = DateUtils.dateAddNum(startTime1, 1,0,-1);
+		}
+
+		Date startTime2 = date2;
+		Date endTime2 = null;
+		if(startTime2!=null){
 			//获取当前时间
-			endTime = DateUtils.dateAddNum(startTime, 1,0,-1);
+			endTime2 = DateUtils.dateAddNum(startTime2, 1,0,-1);
 		}
  
 		lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentHeader::getCreated, createdBegin)
@@ -140,7 +156,8 @@ public class ShipmentHeaderController extends BaseController {
 				.eq(StringUtils.isNotEmpty(shipmentHeader.getShipmentType()),ShipmentHeader::getShipmentType,shipmentHeader.getShipmentType())
 				.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeader::getReferCode, shipmentHeader.getReferCode())
 				.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeader::getReferCodeType, shipmentHeader.getReferCodeType())
-				.between(StringUtils.isNotNull(startTime), ShipmentHeader::getRequestedDeliveryDate, startTime,endTime)
+				.between(StringUtils.isNotNull(startTime1), ShipmentHeader::getRequestedDeliveryDate, startTime1,endTime1)
+				.between(StringUtils.isNotNull(startTime2), ShipmentHeader::getRequestedStartDate, startTime2,endTime2)
 				.eq(shipmentHeader.getFirstStatus()!=null, ShipmentHeader::getFirstStatus, shipmentHeader.getFirstStatus())
 				.eq(shipmentHeader.getLastStatus()!=null, ShipmentHeader::getLastStatus, shipmentHeader.getLastStatus())
 				.orderByAsc(ShipmentHeader::getLastStatus)
@@ -312,7 +329,7 @@ public class ShipmentHeaderController extends BaseController {
         json.put("data", dataArray);
 		ReturnInfo returnInfo = mesReceiptController.postMOM(action, json, "出库单提前结束回传");
 		shipmentHeader.setPushErrorCount(shipmentHeader.getPushErrorCount()+1);
-		if (returnInfo.getCode()==200) {
+		if (returnInfo !=null && returnInfo.getCode()==200) {
 			shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
 			shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_RETURN);
 			shipmentHeader.setPushSuccessStatus(3);
@@ -571,7 +571,7 @@ public class ReceiptTaskService {
                 ReturnInfo returnInfo = mesReceiptController.postE_Rd_In(receiptDetail);
                 ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
                 receiptHeader.setPushErrorCount(receiptHeader.getPushErrorCount()+1);
-                if (returnInfo.getCode()==200) {
+                if (returnInfo !=null && returnInfo.getCode()==200) {
                     BigDecimal pushQty = receiptHeader.getPushQty().add(taskDetail.getQty());
                     receiptHeader.setPushQty(pushQty);
                     receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
@@ -78,10 +78,42 @@
 		        columns: [{
 		            checkbox: true
 		        },
-		        {
-		            field: 'id',
-		            title: '任务编号'
-		        },
+		        // {
+		        //     field: 'id',
+		        //     title: '任务编号'
+		        // },
+				{
+					title: '操作',
+					align: 'center',
+					formatter: function(value, row, index) {
+						var actions = [];
+						actions.push(statusTools(row));
+						actions.push('<a class="btn btn-primary btn-xs ' + statusFlag + '" href="#" onclick="run(\'' + row.id + '\')"><i class="fa fa-send" ></i> 执行</a> ');
+						actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+						actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
+						return actions.join('');
+					}
+				},
+				{
+					field: 'cronExpression',
+					title: '执行表达式'
+				},
+				{
+					field: 'status',
+					title: '任务状态',
+					align: 'center',
+					formatter: function(value, row, index) {
+						return $.table.selectDictLabel(datas, value);
+					}
+				},
+				{
+					field: 'methodName',
+					title: '方法名称'
+				},
+				{
+					field: 'remark',
+					title: '备注',
+				},
 		        {
 		            field: 'jobName',
 		            title: '任务名称',
@@ -92,47 +124,19 @@
 		            title: '任务组名',
 		            sortable: true
 		        },
-		        {
-		            field: 'methodName',
-		            title: '方法名称'
-		        },
+
 		        {
 		            field: 'methodParams',
 		            title: '方法参数'
 		        },
-		        {
-		            field: 'cronExpression',
-		            title: '执行表达式'
-		        },
-		        {
-		            field: 'status',
-		            title: '任务状态',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		            	return $.table.selectDictLabel(datas, value);
-		            }
-		        },
-				{
-					field: 'remark',
-					title: '备注',
-				},
+
+
 		        {
 		            field: 'createTime',
 		            title: '创建时间',
 		            sortable: true
 		        },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		                var actions = [];
-		                actions.push(statusTools(row));
-		                actions.push('<a class="btn btn-primary btn-xs ' + statusFlag + '" href="#" onclick="run(\'' + row.id + '\')"><i class="fa fa-send" ></i> 执行</a> ');
-		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
-		                return actions.join('');
-		            }
-		        }]
+		        ]
 		    };
 		    $.table.init(options);
 		});
@@ -90,10 +90,12 @@
                                         备注：<input type="text" name="shipmentNote"/>
                                     </li>
                                     <li class="time">
+                                        <label>计划开工日期： </label>
+                                        <input type="text" class="time-input" id="requestedStartDate" placeholder="计划开工日期"
+                                               name="startDate" autocomplete="off"/>
                                         <label>计划完成日期： </label>
                                         <input type="text" class="time-input" id="requestedDeliveryDate" placeholder="计划完成日期"
                                                name="deliveryDate" autocomplete="off"/>
-                                        <span>-</span>
                                         <label>创建时间： </label>
                                         <input type="text" class="time-input" id="startTime" placeholder="开始时间"
                                                name="createdBegin" autocomplete="off"/>
@@ -300,6 +302,15 @@
         laydate.render({ elem: '#requestedDeliveryDate', theme: 'molv'});
     });
  
+    //计划开工日期
+    layui.use('laydate', function() {
+        var laydate = layui.laydate;
+        var day1 = new Date();
+        day1.setTime(day1.getTime()+24*60*60*1000*1);
+        // laydate.render({ elem: '#requestedDeliveryDate', theme: 'molv',value: new Date(day1), isInitValue: true});
+        laydate.render({ elem: '#requestedStartDate', theme: 'molv'});
+    });
+
     $(function () {
         var options = {
             url: prefix + "/list",
@@ -345,7 +356,7 @@
                 {
                     field: 'pushSuccessStatus',
                     title: '回传状态',
-                    visible : false,
+                    visible : true,
                     align: 'center',
                     formatter: function(value, row, index) {
                         console.log(row)
@@ -172,6 +172,8 @@
 								return '<span style="color:#263594">任务创建</span>'
 							}else if(value==10){
 								return '<span style="color:#b90e0e">执行状态</span>'
+							}else if(value==50){
+								return '<span style="color:#890eb9">到达拣选台</span>'
 							}else if(value==100 ) {
 								return '<span style="color:green">完成完成</span>'
 							}