更新工单维护

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

@@ -2,14 +2,14 @@ package org.nl.acs.order.service.dto;
 
 import lombok.Data;
 import java.io.Serializable;
-    import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-    import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
-* @description /
-* @author wangs
-* @date 2022-03-31
-**/
+ * @description /
+ * @author wangs
+ * @date 2022-05-24
+ **/
 @Data
 public class CustomerbaseDto implements Serializable {
 

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

@@ -1,22 +1,17 @@
 package org.nl.acs.order.service.dto;
 
 import lombok.Data;
-    import java.math.BigDecimal;
 import java.io.Serializable;
-    import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-    import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
-* @description /
-* @author wangs
-* @date 2022-03-31
-**/
+ * @description /
+ * @author wangs
+ * @date 2022-05-24
+ **/
 @Data
 public class MaterialbaseDto implements Serializable {
 
     /** 物料标识 */
-                /** 防止精度丢失 */
-                @JsonSerialize(using= ToStringSerializer.class)
     private String material_id;
 
     /** 物料编码 */
@@ -41,28 +36,28 @@ public class MaterialbaseDto implements Serializable {
     private String len_unit_id;
 
     /** 物料长度 */
-        private BigDecimal length;
+    private String length;
 
     /** 物料宽度 */
-        private BigDecimal width;
+    private String width;
 
     /** 物料高度 */
-        private BigDecimal height;
+    private String height;
 
     /** 重量单位 */
     private String weight_unit_id;
 
     /** 物料毛重 */
-        private BigDecimal gross_weight;
+    private String gross_weight;
 
     /** 物料净重 */
-        private BigDecimal net_weight;
+    private String net_weight;
 
     /** 体积单位 */
     private String cubage_unit_id;
 
     /** 物料体积 */
-        private BigDecimal cubage;
+    private String cubage;
 
     /** 创建者 */
     private String create_by;
@@ -84,4 +79,11 @@ public class MaterialbaseDto implements Serializable {
 
     /** 是否删除 */
     private String is_delete;
+
+    /** 外径 */
+    private String outer_diameter;
+
+    /** 壁厚 */
+    private String wall_thickness;
+    
 }

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

@@ -1,22 +1,17 @@
 package org.nl.acs.order.service.dto;
 
 import lombok.Data;
-    import java.math.BigDecimal;
 import java.io.Serializable;
-    import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-    import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
-* @description /
-* @author wangs
-* @date 2022-03-18
-**/
+ * @description /
+ * @author wangs
+ * @date 2022-05-24
+ **/
 @Data
 public class ProduceshiftorderDto implements Serializable {
 
     /** 工单标识 */
-            /** 防止精度丢失 */
-//            @JsonSerialize(using= ToStringSerializer.class)
     private String order_id;
 
     /** 工单编码 */
@@ -28,18 +23,54 @@ public class ProduceshiftorderDto implements Serializable {
     /** 工单状态 */
     private String order_status;
 
+    /** 下料数量 */
+    private String qty;
+
     /** 物料编码 */
     private String material_code;
 
     /** 物料名称 */
     private String material_name;
 
+    /** 外径 */
+    private String outer_diameter;
+
+    /** 壁厚 */
+    private String wall_thickness;
+
     /** 物料标识 */
-        private String material_id;
+    private String material_uuid;
 
     /** 规格型号 */
     private String material_spec;
 
+    /** 长度 */
+    private String length;
+
+    /** 上料口 */
+    private String feeding_mouth;
+
+    /** 是否刻字 */
+    private String is_lettering;
+
+    /** 是否套冒 */
+    private String is_risking;
+
+    /** 是否裹膜 */
+    private String is_coating;
+
+    /** 是否捆扎 */
+    private String is_strapping;
+
+    /** 是否贴标 */
+    private String is_labeling;
+
+    /** 开始时间 */
+    private String start_time;
+
+    /** 结束时间 */
+    private String end_time;
+
     /** 创建者 */
     private String create_by;
 
@@ -54,7 +85,4 @@ public class ProduceshiftorderDto implements Serializable {
 
     /** 是否删除 */
     private String is_deleted;
-
-            /** 下料数量 */
-        private String qty;
 }

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

@@ -1,22 +1,17 @@
 package org.nl.acs.order.service.dto;
 
 import lombok.Data;
-import java.math.BigDecimal;
 import java.io.Serializable;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
  * @description /
  * @author wangs
- * @date 2022-03-18
+ * @date 2022-05-24
  **/
 @Data
 public class ProduceshiftorderdetailDto implements Serializable {
 
     /** 工单明细标识 */
-    /** 防止精度丢失 */
-//    @JsonSerialize(using= ToStringSerializer.class)
     private String orderDetail_id;
 
     /** 工单明细编码 */
@@ -26,7 +21,7 @@ public class ProduceshiftorderdetailDto implements Serializable {
     private String orderDetail_type;
 
     /** 优先级 */
-    private BigDecimal priority;
+    private String priority;
 
     /** 顺序号 */
     private String sequence_number;
@@ -37,20 +32,11 @@ public class ProduceshiftorderdetailDto implements Serializable {
     /** 工单编码 */
     private String order_code;
 
-    /** 客户标识 */
-    private String cust_id;
-
-    /** 客户编码 */
-    private String cust_code;
-
-    /** 客户名称 */
-    private String cust_name;
-
-    /** 明细状态 */
-    private String order_status;
+    /** 工单数量 */
+    private String order_qty;
 
-    /** 客户明细数量 */
-    private String detail_qty;
+    /** 工单明细数量 */
+    private String order_detail_qty;
 
     /** 捆扎包数 */
     private String strap_pack_number;
@@ -64,12 +50,6 @@ public class ProduceshiftorderdetailDto implements Serializable {
     /** 捆扎尾料数量 */
     private String strap_tailint_number;
 
-    /** 捆扎直径 */
-    private String starp_diameter;
-
-    /** 捆扎尾料直径 */
-    private String starp_tailint_diameter;
-
     /** 刻字信息 */
     private String lettering_message;
 
@@ -96,4 +76,100 @@ public class ProduceshiftorderdetailDto implements Serializable {
 
     /** 是否删除 */
     private String is_deleted;
+
+    /** 客户信息 */
+    private String cust_name;
+
+    /** 客户标识 */
+    private String cust_id;
+
+    /** 客户编码 */
+    private String cust_code;
+
+    /** 物料标识 */
+    private String material_id;
+
+    /** 物料编码 */
+    private String material_code;
+
+    /** 物料名称  */
+    private String material_name;
+
+    /** 外径 */
+    private String outer_diameter;
+
+    /** 壁厚 */
+    private String wall_thickness;
+
+    /** 物料长度 */
+    private String length;
+
+    /** 工单明细状态 */
+    private String order_detail_status;
+
+    /** 上料数量 */
+    private String feeding_qty;
+
+    /** 上料合格数量 */
+    private String lettering_qualified_qty;
+
+    /** 上料开始时间 */
+    private String feeding_start_time;
+
+    /** 上料完成时间 */
+    private String feeding_end_time;
+
+    /** 刻字合格数量 */
+    private String qualified_lettering_numer;
+
+    /** 刻字开始时间 */
+    private String lettering_start_time;
+
+    /** 刻字完成时间 */
+    private String lettering_finish_time;
+
+    /** 当前套冒数量 */
+    private String present_sleeveing_numer;
+
+    /** 套冒合格数量 */
+    private String qualified_sleeveing_number;
+
+    /** 套冒开始时间 */
+    private String sleeveing_start_time;
+
+    /** 套冒完成时间 */
+    private String sleeveing_finish_time;
+
+    /** 捆扎开始时间 */
+    private String starp_start_time;
+
+    /** 捆扎完成时间 */
+    private String starp_finish_time;
+
+    /** 裹膜数量 */
+    private String wraping_number;
+
+    /** 当前裹膜数量 */
+    private String present_wraping_number;
+
+    /** 裹膜合格数量 */
+    private String qualified_wraping_number;
+
+    /** 裹膜开始时间 */
+    private String wraping_start_time;
+
+    /** 裹膜完成时间 */
+    private String wraping_finish_time;
+
+    /** 贴标开始时间 */
+    private String labeling_start_time;
+
+    /** 贴标完成时间 */
+    private String labeling_finish_time;
+
+    /** 开始时间 */
+    private String start_time;
+
+    /** 结束时间 */
+    private String end_time;
 }

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

@@ -57,7 +57,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
     }
 
 
-
     @Override
     public List<MaterialbaseDto> queryAll(){
         WQLObject wo = WQLObject.getWQLObject("acs_materialbase");

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

@@ -153,6 +153,10 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
         String material_code = MapUtil.getStr(whereJson, "material_code");
         String material_name = MapUtil.getStr(whereJson, "material_name");
         String material_spec = MapUtil.getStr(whereJson, "material_spec");
+        String outer_diameter = MapUtil.getStr(whereJson, "outer_diameter");
+        String wall_thickness = MapUtil.getStr(whereJson, "wall_thickness");
+        String length = MapUtil.getStr(whereJson, "length");
+
         String qty = MapUtil.getStr(whereJson, "qty");
 
         if(StrUtil.isEmpty(material_code)){
@@ -167,12 +171,21 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
         orderDto.setMaterial_code(material_code);
         orderDto.setMaterial_name(material_name);
         orderDto.setMaterial_spec(material_spec);
+        orderDto.setLength(length);
+        orderDto.setOuter_diameter(outer_diameter);
+        orderDto.setWall_thickness(wall_thickness);
         orderDto.setOrder_id(order_id);
         orderDto.setOrder_code(order_code);
         orderDto.setQty(qty);
-        orderDto.setOrder_status("0");
+        orderDto.setOrder_status("00");
         orderDto.setIs_deleted("0");
         orderDto.setCreate_by(currentUsername);
+        orderDto.setIs_coating("1");
+        orderDto.setIs_labeling("1");
+        orderDto.setIs_lettering("1");
+        orderDto.setIs_risking("1");
+        orderDto.setIs_strapping("1");
+        orderDto.setIs_unbundling("1");
 
         for(int i=0; i<tableData.size(); i++){
             JSONObject jsonObject = tableData.getJSONObject(i);
@@ -184,24 +197,33 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
             String customer_code = detaildto.getCust_code();
             //客户名称
             String customer_name = detaildto.getCust_name();
-            //包装数量
-            String detail_qty = detaildto.getDetail_qty();
+            //明细号客户数量
+            String detail_qty = detaildto.getOrder_detail_qty();
             //刻字信息
             String lettering_message = detaildto.getLettering_message();
             //捆扎每包数量
             String strap_number = detaildto.getStrap_number();
-
+            //尾料数量
+            String strap_tailint_number = String.valueOf(Integer.parseInt(detail_qty)%Integer.parseInt(strap_number));
             detaildto.setOrder_id(order_id);
             detaildto.setOrder_code(order_code);
+            detaildto.setOrder_detail_status("00");
             detaildto.setIs_deleted("0");
             detaildto.setOrderDetail_id(IdUtil.simpleUUID());
-            detaildto.setOrderDetail_code(order_detral_code);
+            detaildto.setOrderDetail_code(String.valueOf(i));
             detaildto.setCust_id(customer_id);
             detaildto.setCust_code(customer_code);
             detaildto.setCust_name(customer_name);
-            detaildto.setDetail_qty(detail_qty);
+            detaildto.setMaterial_code(material_code);
+            detaildto.setMaterial_id(material_id);
+            detaildto.setMaterial_name(material_name);
+            detaildto.setLength(length);
+            detaildto.setWall_thickness(wall_thickness);
+            detaildto.setOuter_diameter(outer_diameter);
+            detaildto.setOrderDetail_code(detail_qty);
             detaildto.setLabeling_message(lettering_message);
             detaildto.setStrap_number(strap_number);
+            detaildto.setStrap_tailint_number(strap_tailint_number);
             WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail");
             JSONObject json = (JSONObject) JSONObject.toJSON(detaildto);
             wo.insert(json);