250310排产,铨一的备注列

zkqy-business/pom.xml

@@ -50,6 +50,10 @@
             <groupId>com.zkqy</groupId>
             <artifactId>zkqy-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-custom-business</artifactId>
+        </dependency>
 
 
     </dependencies>

zkqy-custom-business/src/main/java/com/zkqy/business/domain/vo/AmmunitionPlanInformationIntermediateTableRVo.java

@@ -14,6 +14,16 @@ public class AmmunitionPlanInformationIntermediateTableRVo {
         return macId;
     }
 
+    public  String number;
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
     public void setMacId(String macId) {
         this.macId = macId;
     }

zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml

@@ -555,7 +555,16 @@
           AND p.del_flag = '0'
           and sp.sale_order_no = #{saleOrderNo}
     </select>
-
+<!--    SELECT-->
+<!--    sp.*,cs.custom_name,m.materie_encoding,m.materie_color_number,pd.product_specifications-->
+<!--    FROM-->
+<!--    {DBNAME}.sale_products AS sp-->
+<!--    INNER JOIN {DBNAME}.sale_order AS so ON sp.sale_order_no = so.sale_no-->
+<!--    Inner Join {DBNAME}.customer as cs ON so.sale_custom_no= cs.custom_no-->
+<!--    inner join {DBNAME}.materiel as m on sp.colour_number= m.materiel_code-->
+<!--    inner join {DBNAME}.production as pd on sp.product_no= pd.product_no-->
+<!--    left join {DBNAME}.production_line as pl on sp.production_line_no=pl.id-->
+<!--    where sp.del_flag = '0' and cs.del_flag = '0' and m.del_flag = '0'  and so.order_type=2-->
     <select id="selectSaleProductsListAndCustomInfoThread"
             resultType="com.zkqy.business.domain.vo.SaleProductsVo">
         SELECT

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/domain/PlanTaskDetails.java

@@ -25,6 +25,16 @@ public class PlanTaskDetails extends BaseEntity
     /** 描述信息 */
     private Long description;
 
+    private String shopCoding;
+
+    public String getShopCoding() {
+        return shopCoding;
+    }
+
+    public void setShopCoding(String shopCoding) {
+        this.shopCoding = shopCoding;
+    }
+
     /**
      * 单据类型
      */

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/jd/domain/JdProductionOrder.java

@@ -28,7 +28,16 @@ public class JdProductionOrder extends BaseEntity
     @JSONField(name = "FBillNo")
     private String documentNumber;
 
+    @JSONField(name = "FWorkShopID.FNumber")
+    private String shopCoding;
 
+    public String getShopCoding() {
+        return shopCoding;
+    }
+
+    public void setShopCoding(String shopCoding) {
+        this.shopCoding = shopCoding;
+    }
 
     /** 明细备注 */
     @Excel(name = "明细备注")

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/jd/service/impl/JdProductionOrderServiceImpl.java

@@ -156,7 +156,7 @@ public class JdProductionOrderServiceImpl implements JdProductionOrderService
                 String query = "{\n" +
                         "    \"FormId\": \"PRD_MO\",\n" +
                         "    \"FieldKeys\": \"FBomId.FNumber,FUnitId.FNumber,fid,FSrcBillNo,FTreeEntity_FEntryId,FDescription,F_PONP_teshuyaoqiu,FBillNo,FBillType,FDate,FDocumentStatus," +
-                        "FProductType,FMaterialId,FWorkShopID0,FQty,FStatus,FSaleOrderNo,FPickMtrlStatus,FMemoItem," +
+                        "FProductType,FMaterialId,FWorkShopID0,FQty,FStatus,FSaleOrderNo,FPickMtrlStatus,FMemoItem,FWorkShopID.FNumber," +
                         "FMaterialId.FNumber,FMaterialName,F_PONP_BaseProperty,FSpecification,FUnitId.FName,F_PONP_yanse,F_PONP_mingpai,F_PONP_hegezheng.FDataValue," +
                         "F_PONP_shuomingshu.FDataValue,F_PONP_KaiGuanXiang,F_PONP_baozhuangxiang,F_PONP_GongLv,FPlanFinishDate,FPlanStartDate,F_PONP_XQRQ,FPlanStartDate,FPlanFinishDate\",\n" +
                         "    \"FilterString\": [" +
@@ -316,6 +316,7 @@ public class JdProductionOrderServiceImpl implements JdProductionOrderService
                                 planTaskDetails.setFbillno(a.getDocumentNumber());//生产订单号
                                 planTaskDetails.setFsrcbillno(a.getDemandDocument());//销售订单号
                                 planTaskDetails.setFunitidfNumber(a.getFunitidfNumber());//单位编号
+                                planTaskDetails.setShopCoding(a.getShopCoding());//车间编码
                                 if (StringUtils.isNotNull(a.getDocumentDate())) {
                                     planTaskDetails.setTimeOfRequest(a.getDocumentDate());
                                 }
@@ -393,6 +394,7 @@ public class JdProductionOrderServiceImpl implements JdProductionOrderService
                         planTaskDetailsAdd.setFtreeEntityFentryid(a.getFtreeEntityFentryid());
                         planTaskDetailsAdd.setFbillno(a.getDocumentNumber());//生产订单号
                         planTaskDetailsAdd.setFsrcbillno(a.getDemandDocument());//销售订单号
+                        planTaskDetailsAdd.setShopCoding(a.getShopCoding());//车间编码
                         planTaskDetailsAdd.setFunitidfNumber(a.getFunitidfNumber());//单位编号
                         if (StringUtils.isNotNull(a.getDocumentDate())) {
                             planTaskDetailsAdd.setTimeOfRequest(a.getDocumentDate());
@@ -401,7 +403,7 @@ public class JdProductionOrderServiceImpl implements JdProductionOrderService
                         planTaskDetailsMapper.insertPlanTaskDetails(planTaskDetailsAdd);
 
                         //判断那个字段是否为空
-                        boolean present = Optional.ofNullable(a)
+                        boolean present = Optional.ofNullable(a.getFMemoItem())
                                 .filter(s -> !a.getFMemoItem().isEmpty())
                                 .isPresent();
                         if(present){

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/scheduling/ScheduledBean.java

@@ -81,7 +81,7 @@ public class ScheduledBean {
                 String query = "{\n" +
                         "    \"FormId\": \"PRD_MO\",\n" +
                         "    \"FieldKeys\": \"FBomId.FNumber,FUnitId.FNumber,fid,FSrcBillNo,FTreeEntity_FEntryId,FDescription,F_PONP_teshuyaoqiu,FBillNo,FBillType,FDate,FDocumentStatus," +
-                        "FProductType,FMaterialId,FWorkShopID0,FQty,FStatus,FSaleOrderNo,FPickMtrlStatus,FMemoItem," +
+                        "FProductType,FMaterialId,FWorkShopID0,FQty,FStatus,FSaleOrderNo,FPickMtrlStatus,FMemoItem,FWorkShopID.FNumber," +
                         "FMaterialId.FNumber,FMaterialName,F_PONP_BaseProperty,FSpecification,FUnitId.FName,F_PONP_yanse,F_PONP_mingpai,F_PONP_hegezheng.FDataValue," +
                         "F_PONP_shuomingshu.FDataValue,F_PONP_KaiGuanXiang,F_PONP_baozhuangxiang,F_PONP_GongLv,FPlanFinishDate,FPlanStartDate,F_PONP_XQRQ,FPlanStartDate,FPlanFinishDate\",\n" +
                         "    \"FilterString\": [" +
@@ -236,6 +236,7 @@ public class ScheduledBean {
 //                                String formattedDate = formatter1.format(a.getDocumentDate());
                                     planTaskDetails.setTimeOfRequest(a.getDocumentDate());
                                 }
+                                planTaskDetails.setShopCoding(a.getShopCoding());//生产车间
                                 planTaskDetails.setFid(a.getFid());
                                 planTaskDetails.setFtreeEntityFentryid(a.getFtreeEntityFentryid());
                                 planTaskDetails.setFbillno(a.getDocumentNumber());//生产订单号
@@ -317,11 +318,12 @@ public class ScheduledBean {
                         if (StringUtils.isNotNull(a.getDocumentDate())) {
                             planTaskDetailsAdd.setTimeOfRequest(a.getDocumentDate());
                         }
+                        planTaskDetailsAdd.setShopCoding(a.getShopCoding());//生产车间
                         planTaskDetailsAdd.setFbomIdFnumber(a.getFbomIdFnumber());//BOM版本
                         planTaskDetailsMapper.insertPlanTaskDetails(planTaskDetailsAdd);
 
                         //判断那个字段是否为空
-                        boolean present = Optional.ofNullable(a)
+                        boolean present = Optional.ofNullable(a.getFMemoItem())
                                 .filter(s -> !a.getFMemoItem().isEmpty())
                                 .isPresent();
                         if(present){

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/StationInformationServiceImpl.java

@@ -915,7 +915,7 @@ public class StationInformationServiceImpl implements IStationInformationService
                         item.setCkNumber("CK005");
                         item.setDeliveryWarehouse("车间仓");
                         item.setFlowSequenceNumber(lxkNumber);//流转序列号
-                        boolean present = Optional.of(gxMap.get(item.getProcess())).filter(a->!a.isEmpty()).isPresent();
+                        boolean present = Optional.ofNullable(gxMap.get(item.getProcess())).filter(a->!a.isEmpty()).isPresent();
                         if(present){
                             item.setMesprocess(gxMap.get(item.getProcess())); //工序
                         }else {
@@ -1098,6 +1098,15 @@ public class StationInformationServiceImpl implements IStationInformationService
             Map<String,String > map1 = objectMapper.readValue(fMaterialIdString, Map.class);
             map1.put("FNumber",planTaskDetails1.getMaterialId());
             map.put("FMaterialId",map1);
+
+            //生产车间信息
+            boolean present = Optional.ofNullable(planTaskDetails1.getShopCoding()).filter(a -> !a.isEmpty()).isPresent();
+            if(present){
+                HashMap<String, String> shopCoding = new HashMap<>();
+                shopCoding.put("FNumber",planTaskDetails1.getShopCoding());
+                map.put("FWorkshipId",shopCoding);
+            }
+
             map.put("FMoBillNo",planTaskDetails1.getDemandDocument());
             map.put("FSrcBillNo",planTaskDetails1.getDemandDocument()); //生产订单号
             map.put("FReqBillNo",ringScanInformation.getOverNumber()); //订单号
@@ -1112,6 +1121,7 @@ public class StationInformationServiceImpl implements IStationInformationService
             }else if(type.equals("4")) {
                 FStockId.put("FNumber","CK006"); //利库仓
             }
+
             map.put("FStockId",FStockId);
             String FSNUnitIDJson = objectMapper.writeValueAsString( map.get("FSNUnitID"));
             Map<String,String > FSNUnitIDMap = objectMapper.readValue(FSNUnitIDJson, Map.class);
@@ -1411,6 +1421,14 @@ public class StationInformationServiceImpl implements IStationInformationService
             fNumber.put("FNumber",planTaskDetails1.getMaterialId());
             map7.put("FMaterialId",fNumber);
 
+            //生产车间信息
+            boolean present = Optional.ofNullable(planTaskDetails1.getShopCoding()).filter(a -> !a.isEmpty()).isPresent();
+            if(present){
+                HashMap<String, String> shopCoding = new HashMap<>();
+                shopCoding.put("FNumber",planTaskDetails1.getShopCoding());
+                map7.put("FWorkshipId",shopCoding);
+            }
+
             HashMap<String, String> fUnitIDfNumber = new HashMap<>();
             fUnitIDfNumber.put("FNumber",FUnitIDFNumber);
             map7.put("FUnitID",fUnitIDfNumber);

zkqy-fujian-amichi/src/main/resources/mapper/PlanTaskDetailsMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="quantity"    column="quantity"    />
         <result property="documentType" column="document_type"/>
+        <result property="shopCoding" column="shop_coding"/>
         <result property="remark"    column="remark"    />
         <result property="createById"    column="create_by_id"    />
         <result property="createBy"    column="create_by"    />
@@ -83,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select fid,fbomIdFnumber,ftreeEntity_fentryid,funitidfNumber,fbillno,fsrcbillno,id, quantity,  remark,  document_type,
                create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flag, data_approval_status, process_key,
                task_process_key, task_node_key, plan_id, material_id, material_name, model_number, specification, material_unit, demand_document,
-               time_of_request, customer_model, power, colour, mingpai, shuomingshu, hegezheng, description, baozhuangxiang,status
+               time_of_request, customer_model, power, colour, mingpai, shuomingshu, hegezheng, description, baozhuangxiang,status,shop_coding
         from fjqydb.plan_task_details
     </sql>
 
@@ -128,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="quantity != null">quantity,</if>
             <if test="documentType != null">document_type,</if>
+            <if test="shopCoding != null">shop_coding,</if>
             <if test="remark != null">remark,</if>
             <if test="createById != null">create_by_id,</if>
             <if test="createBy != null">create_by,</if>
@@ -168,9 +170,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fbomIdFnumber != null  and fbomIdFnumber != ''">fbomIdFnumber,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-
             <if test="quantity != null">#{quantity},</if>
             <if test="documentType != null">#{documentType},</if>
+            <if test="shopCoding != null">#{shopCoding},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createById != null">#{createById},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -211,6 +213,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fbomIdFnumber != null  and fbomIdFnumber != ''">#{fbomIdFnumber},</if>
          </trim>
     </insert>
+
     <!--查询生产订单号 -->
     <update id="updatePlanTaskDetailsByDemandDocument" parameterType="com.zkqy.amichi.domain.PlanTaskDetails">
         update fjqydb.plan_task_details
@@ -304,7 +307,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deletePlanTaskDetailsByDemandDocument" parameterType="String">
         delete from {DBNAME}.plan_task_details where demand_document in
         <foreach item="id" collection="list" open="(" separator="," close=")">
-            #{demandDocument}
+            #{id}
         </foreach>
     </delete>
 

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/chemicalfiber/AddAmmunitionPickingUp.java

@@ -53,16 +53,11 @@ public class AddAmmunitionPickingUp implements IRunBPMService {
         result.getResultMap().put("saleProducts",saleProducts);
         result.getResultMap().put("products",products);
         result.getResultMap().put("productAddAmmunition",productAddAmmunition);
-
-
-
-
         return result;
     }
 
     @Override
     public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
-
         return AjaxResult.success();
     }
 

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/chemicalfiber/AddAmmunitionWireOn.java

@@ -11,6 +11,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PreDestroy;
+import java.util.HashMap;
 
 /**
  * 加弹-上丝-正常节点
@@ -45,7 +46,7 @@ public class AddAmmunitionWireOn implements IRunBPMService {
         productAddAmmunitionParam.getConditionMap().put("del_flag","0");
         productAddAmmunitionParam.getConditionMap().put("add_ammunition_type","2");
         CommonEntity productAddAmmunition = commonService.getInfoById(productAddAmmunitionParam);
-
+        HashMap hashMap=new HashMap();
         CommonEntity result = new CommonEntity();
         result.getResultMap().put("saleProducts",saleProducts);
         result.getResultMap().put("products",products);

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/CommonAutoExecute.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.PreDestroy;
 
 /**
- * 共通自动执行-正常节点
+ * @Desc（共通自动执行-正常节点）
  */
 @Service("850da57a-0037-4f16-9887-1985656278e5")
 @Scope("prototype")

zkqy-ui/src/views/orderMange/retailMange/index.vue

@@ -1438,6 +1438,7 @@ export default {
         craftMark: "", //包装/贴唛
         shippingMethod: "", //运输方式
       });
+
       this.productionTableData = [];
     },
     // 自定义的小计计算方法