嘉耐更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java

@@ -276,11 +276,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 String molten_pool = json.getString("molten_pool");
                 String weight = json.getString("weight");
                 String qty = json.getString("plan_qty");
+                String product_type = json.getString("product_type");
                 String product_code = json.getString("product_code");
-                String AlongSide = json.getString("AlongSide");
-                String BshortSide = json.getString("BshortSide");
-                String Htrapezoidal = json.getString("Htrapezoidal");
-                String Wthickness = json.getString("Wthickness");
+                String AlongSide = json.getString("alongside");
+                String BshortSide = json.getString("bshortside");
+                String Htrapezoidal = json.getString("htrapezoidal");
+                String Wthickness = json.getString("wthickness");
 
                 if (StrUtil.isEmpty(producetask_code)) {
                     throw new WDKException("工单号不能为空");
@@ -375,7 +376,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                     //下发成功后，写入工单信息表记录
                     ProduceshiftorderDto dto = new ProduceshiftorderDto();
                     dto.setOrder_code(producetask_code);
-                    dto.setProduct_code(product_code);
+                    dto.setProduct_type(product_type);
                     dto.setDevice_code(device_code);
                     dto.setOrder_status("0");
                     dto.setMaterial_code(material_code);

acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderDto.java

@@ -28,7 +28,7 @@ public class ProduceshiftorderDto implements Serializable {
         private String qty;
 
             /** 产品编码 */
-        private String product_code;
+        private String product_type;
 
             /** 物料编码 */
         private String material_code;

acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java

@@ -140,7 +140,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService {
             map.put("设备编码", produceshiftorder.getDevice_code());
             map.put("工单状态", produceshiftorder.getOrder_status());
             map.put("下料数量", produceshiftorder.getQty());
-            map.put("产品编码", produceshiftorder.getProduct_code());
+            map.put("工单类型", produceshiftorder.getProduct_type());
             map.put("物料编码", produceshiftorder.getMaterial_code());
             map.put("物料名称", produceshiftorder.getMaterial_name());
             map.put("物料标识", produceshiftorder.getMaterial_uuid());
@@ -172,7 +172,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService {
 
         //判断是否为wms下发的排产单
         String hasWms = acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS);
-        if (StrUtil.isNotEmpty(dto.getProduct_code()) && hasWms.equals("1")) {
+        if (StrUtil.isNotEmpty(dto.getProduct_type()) && hasWms.equals("1")) {
             JSONObject json = new JSONObject();
             json.put("producetask_code",dto.getOrder_code());
             json.put("device_code",dto.getDevice_code());

acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql

@@ -49,7 +49,7 @@
 			    prod.order_code,
 			    prod.order_status,
                 prod.qty,
-                prod.product_code,
+                prod.product_type,
                 prod.material_code,
                 prod.material_name,
                 prod.material_uuid,

acs/qd/src/views/monitor/logback/index.vue

@@ -464,7 +464,7 @@ export default {
 
 <style scoped>
 .log-warpper {
-  word-break: break-all;
+  word-break: break-word;
   word-wrap: break-word
 }
 </style>

wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java

@@ -300,7 +300,7 @@ public class ProducetaskServiceImpl implements ProducetaskService {
             taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0);
         }
 
-        taskObj.put("product_code", "wms");
+        taskObj.put("product_type", "wms");
         WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class);
         JSONArray arr = new JSONArray();
         arr.add(taskObj);

wms/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/impl/WorkprocedureiosServiceImpl.java

@@ -44,7 +44,7 @@ import cn.hutool.core.util.ObjectUtil;
 @Slf4j
 public class WorkprocedureiosServiceImpl implements WorkprocedureiosService {
     private final String THIS_CLASS = SendMaterialTask.class.getName();
-   private SendMaterialTask sendMaterialTask;
+
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
 
@@ -238,7 +238,7 @@ public class WorkprocedureiosServiceImpl implements WorkprocedureiosService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void genTask(JSONObject taskJson) {
-
+        SendMaterialTask sendMaterialTask = new SendMaterialTask();
         String iostorinv_id = taskJson.getString("iostorinv_id");
         WQLObject wo = WQLObject.getWQLObject("st_ivt_workprocedureios");
         JSONObject jsonObject = wo.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);