Merge remote-tracking branch 'origin/master'

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java

@@ -443,14 +443,6 @@ public class ProOrderServiceImpl implements IProOrderService {
             sapqo.setErdat(maxCreateTime.getCreateTimeStr());//S_ERDAT(创建日期) 例如：20230923
         }
 
-//        //添加调用sap日志
-//        SysSapLog sysSapLog = new SysSapLog();
-//        sysSapLog.setId(IdUtils.fastSimpleUUID());
-//        sysSapLog.setMesssge(sapqo.toString());
-//        sysSapLog.setMethod("syncSAP");
-//        sysSapLog.setReqcode("请求");
-//        sysSapLog.setCreateTime(DateUtils.getNowDate());
-//        proOrderMapper.addSapLog(sysSapLog);
         logger.info("手动订单同步：【参数】"+ JSONObject.toJSONString(sapqo));
          //取>=20230923的sap数据
         R<List<SapProOrder>> rSapProOrder = remoteSapService.shopOrderSync(sapqo);//sap只能同步指定日期的数据
@@ -510,7 +502,7 @@ public class ProOrderServiceImpl implements IProOrderService {
             proOrder.setQuantitySplit(0L);
             ProOrderWorkorder owork = new ProOrderWorkorder();
             owork.setOrderCode(proOrder.getOrderCode());
-            owork.setStatusArray("'w2','w3','w4'");//已派发w1未派w0活动w2报工w3暂停w4
+            owork.setStatusArray("'w1','w2','w3','w4'");//已派发w1未派w0活动w2报工w3暂停w4
             List<ProOrderWorkorder> workOrders = proOrderWorkorderMapper.selectProOrderWorkorderList(owork);
             if (CollectionUtils.isEmpty(workOrders)) {//更新
                 proOrder.setUpdateTime(nowDate);
@@ -529,7 +521,7 @@ public class ProOrderServiceImpl implements IProOrderService {
                 logger.info("=======订单"+proOrder.getOrderCode()+"同步成功");
             }else{
                 failOrder = proOrder.getOrderCode();
-                logger.info("=======订单" + failOrder + "同步失败");
+                logger.info("=======订单"+failOrder+"同步忽略，订单已经派发");
             }
         }
         return failOrder;
@@ -627,7 +619,6 @@ public class ProOrderServiceImpl implements IProOrderService {
 
     /**
      * 获取班次信息list
-     *
      * @return
      */
     @Override
@@ -638,7 +629,6 @@ public class ProOrderServiceImpl implements IProOrderService {
 
     /**
      * 通过订单物料code查询工艺list
-     *
      * @param prodCode
      * @return
      */
@@ -650,7 +640,6 @@ public class ProOrderServiceImpl implements IProOrderService {
 
     /**
      * 通过工艺编码获取设备信息list
-     *
      * @param routeCode
      * @return
      */
@@ -694,7 +683,6 @@ public class ProOrderServiceImpl implements IProOrderService {
 
     /**
      * 通过母订单Code查询级联订单信息并封装
-     *
      * @param orderCode
      * @return
      */
@@ -1094,7 +1082,6 @@ public class ProOrderServiceImpl implements IProOrderService {
         }
         return success();
     }
-
     public static void main(String args[]){
         String arrayStr = "[[\"GX01\",\"LG1\"],[\"GX01\",\"LG2\"],[\"GX02\",\"S1\"],[\"GX02\",\"S2\"],[\"GX03\",\"HF01\"],[\"GX04\",\"SPJ01\"]]";
         JSONArray jsonArray = JSONArray.parseArray(arrayStr);

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -315,6 +315,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 SapCreateOrder sap = new SapCreateOrder();
                 sap.setWerks(whiteOrder.getFactoryCode());//工厂编码
                 sap.setAufpar("LJ01");//订单类型
+                sap.setVerid(whiteOrder.getAttr2());//生产版本
                 sap.setMatnr(whiteOrder.getProductCode());//物料编号
                 sap.setQuantity(whiteOrder.getQuantitySplit() + "");//数量
                 sap.setDates(DateUtils.parseDateToStr("yyyy-MM-dd", whiteOrder.getProductDate()));//开始时间

op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java

@@ -6,7 +6,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
+import org.slf4j.Logger;
 import javax.servlet.http.HttpServletResponse;
 
 import com.op.system.domain.SysMenu;
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
+import org.slf4j.LoggerFactory;
 import com.op.common.core.constant.CacheConstants;
 import com.op.common.core.domain.R;
 import com.op.common.core.utils.StringUtils;

op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java

@@ -154,6 +154,15 @@ public class OdsProcureOutOrder extends BaseEntity {
      */
     @Excel(name = "用户自定义属性2")
     private String userDefined2;
+    private String workorderCode;
+
+    public String getWorkorderCode() {
+        return workorderCode;
+    }
+
+    public void setWorkorderCode(String workorderCode) {
+        this.workorderCode = workorderCode;
+    }
 
     /**
      * 用户自定义属性3

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java

@@ -82,4 +82,6 @@ public interface OdsProcureOutOrderMapper {
     List<String> selectOdsProcureOutOrderListZUKEN(OdsProcureOutOrder order);
 
     List<String> selectOdsProcureOutOrderListZUKENX(OdsProcureOutOrder order);
+
+    String selectMachineCode(@Param("order")OdsProcureOutOrder odsProcureOutOrder);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -284,14 +284,15 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     public OdsProcureOutOrder PurchaseOrderOutboundPda(OdsProcureOutOrder odsProcureOrder) {
         //母单，其中list里面是对应的子单
         OdsProcureOutOrder odsProcureOutOrder = odsProcureOutOrderMapper.selectmesPrepare(odsProcureOrder);
-
+        String  machine=  odsProcureOutOrderMapper.selectMachineCode(odsProcureOutOrder);
         if (odsProcureOutOrder != null) {
             List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.selectmesPrepareDetail(odsProcureOutOrder);
+            for (OdsProcureOutOrder order:orderList){
+                order.setProductionLineCode(machine);
+            }
             odsProcureOutOrder.setList(orderList);
         }
-
         return odsProcureOutOrder;
-
     }
 
     @Override

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml

@@ -39,6 +39,7 @@
         <result property="Active" column="Active"/>
         <result property="enterpriseId" column="Enterprise_Id"/>
         <result property="enterpriseCode" column="Enterprise_Code"/>
+		<result property="workorderCode" column="workorderCode"/>
     </resultMap>
     <sql id="pagination_tail">
 		limit #{page.pageOffset} , #{page.rows}
@@ -49,7 +50,8 @@
 	<select id="selectOdsProcureOutOrderListZU" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
 		SELECT
 		Produce_Code,
-        User_Defined1
+		User_Defined1,
+		MAX(Create_Date) AS Create_Date
 		FROM
 		ods_procure_out_order
 		where
@@ -58,6 +60,8 @@
         </if>
 		<if test="userDefined1 != null  and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
 		GROUP BY   Produce_Code,User_Defined1
+		ORDER BY
+		Create_Date DESC;
 	</select>
 	<select id="selectOdsProcureOutOrderListZUKEN"	resultType="java.lang.String">
 		SELECT	DISTINCT
@@ -81,13 +85,10 @@
 		<if test="userDefined1 != null  and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
 		AND	User_Defined3	='x'
 	</select>
-    <select id="selectOdsProcureOutOrderListZUT" parameterType="OdsProcureOutOrder"
+	<select id="selectOdsProcureOutOrderListZUT" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
-            resultMap="OdsProcureOutOrderResult">
 		<include refid="selectOdsProcureOutOrderVo"/>
 		<where>
-            <if test="produceCode != null  and produceCode != ''">and Produce_Code like concat('%', #{produceCode},
+			<if test="produceCode != null  and produceCode != ''"> and Produce_Code	like concat('%', #{produceCode}, '%')</if>
-                '%')
-            </if>
 			<if test="userDefined1 != null  and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
 			<if test="Active != null  and Active != ''"> and Active = #{Active}</if>
 		</where>
@@ -105,12 +106,8 @@
 			<if test="outNumber != null "> and Out_Number = #{outNumber}</if>
 			<if test="locCode != null  and locCode != ''"> and Loc_Code = #{locCode}</if>
 			<if test="locDesc != null  and locDesc != ''"> and Loc_Desc = #{locDesc}</if>
-            <if test="productionLineDesc != null  and productionLineDesc != ''">and Production_Line_Desc =
+			<if test="productionLineDesc != null  and productionLineDesc != ''"> and Production_Line_Desc = #{productionLineDesc}</if>
-                #{productionLineDesc}
+			<if test="productionLineCode != null  and productionLineCode != ''"> and Production_Line_Code = #{productionLineCode}</if>
-            </if>
-            <if test="productionLineCode != null  and productionLineCode != ''">and Production_Line_Code =
-                #{productionLineCode}
-            </if>
 			<if test="orderStatus != null  and orderStatus != ''"> and Order_Status = #{orderStatus}</if>
 			<if test="userDefined1 != null  and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
 			<if test="userDefined2 != null  and userDefined2 != ''"> and User_Defined2 = #{userDefined2}</if>
@@ -124,9 +121,7 @@
 			<if test="userDefined10 != null  and userDefined10 != ''"> and User_Defined10 = #{userDefined10}</if>
 			<if test="userDefined11 != null  and userDefined11 != ''"> and User_Defined11 = #{userDefined11}</if>
 			<if test="supplierCode != null  and supplierCode != ''"> and Supplier_Code = #{supplierCode}</if>
-            <if test="supplierName != null  and supplierName != ''">and Supplier_Name like concat('%', #{supplierName},
+			<if test="supplierName != null  and supplierName != ''"> and Supplier_Name like concat('%', #{supplierName}, '%')</if>
-                '%')
-            </if>
 			<if test="createBy != null  and createBy != ''"> and Create_By = #{createBy}</if>
 			<if test="createDate != null "> and Create_Date = #{createDate}</if>
 			<if test="lastUpdateBy != null  and lastUpdateBy != ''"> and Last_Update_By = #{lastUpdateBy}</if>
@@ -272,6 +267,7 @@
 		SELECT
 			prepare_id	id,
 			workorder_name	Produce_Code,
+			workorder_code	workorderCode,
 			product_code	Material_Code,
 			product_name	Material_Desc,
 			unit	Unit,
@@ -405,4 +401,10 @@
 			#{item.userDefined1}
 		</foreach>
 	</select>
+	<select id="selectMachineCode"	resultType="java.lang.String">
+		SELECT
+			machine_code
+		FROM	mes_report_work
+		WHERE	workorder_code=#{order.workorderCode}	AND	end_report='1'
+	</select>
 </mapper>