update

工单生产进度报表-产品型号改为工作令
  生产操作员面板-条码弹出框，检索条件
  生产派工页面新增一个检索条件物料描述，模糊查询
  生产操作员面板端展示列数量后面新加标准工时
  车间转出取值-上个工序已经完成并且检验已经合格的

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -643,7 +643,7 @@
     <select id="shopOrderSchedule" parameterType="java.util.HashMap" resultType="java.util.HashMap">
     SELECT ROWNUM SEQ,S.* FROM (
         SELECT wct.DESCRIPTION WORK_CENTER_DESCRIPTION,cf.VALUE ITEM_NUMBER,
-               COALESCE(dflt.DATA_TAG,cf2.VALUE) PRODUCT_CATEGORY,
+               COALESCE(dflt.DATA_TAG,cf2.VALUE) WORK_ORDER,
                zsd.SHOP_ORDER,it.DESCRIPTION ITEM_DESCRIPTION,zsd.PLANNED_START_DATE,zsd.PLANNED_START_DATE PREDICT_COMP_DATE,
                zsd.PLANNED_COMP_DATE ,zsd.ACTUAL_START_DATE ,zsd.ACTUAL_COMPLETE_DATE,
                CASE WHEN zsd.DISPATCH_STATUS = 'NEW' THEN '新建'
@@ -676,7 +676,7 @@
                  LEFT JOIN WORK_CENTER_T wct ON wct.WORK_CENTER_BO = wc.HANDLE AND wct.LOCALE = 'zh'
                  LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
                  LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'ITEM_NUMBER'
-                 LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'PRODUCT_CATEGORY'
+                 LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
                  LEFT JOIN ITEM i On i.HANDLE = so.ITEM_BO
                  LEFT JOIN ITEM_T it ON it.ITEM_BO = so.ITEM_BO
                  LEFT JOIN RESRCE r ON r.RESRCE = zsd.RESRCE AND r.SITE = zsd.SITE
@@ -692,8 +692,8 @@
                  LEFT JOIN ROUTER_STEP rs ON zsd.ROUTER_BO = rs.ROUTER_BO AND rs.STEP_ID = zsd.STEP_ID
                  LEFT JOIN ROUTER_OPERATION ro ON ro.ROUTER_STEP_BO = rs.HANDLE AND ro.OPERATION_BO = ss.OPERATION_BO
                  LEFT JOIN CUSTOM_FIELDS cf3 ON cf3.HANDLE = ro.HANDLE AND cf3."ATTRIBUTE" = 'PROD_TIME'
-                 INNER JOIN DATA_FIELD df ON df.DATA_FIELD = 'PRODUCT_CATEGORY'
-                 LEFT JOIN DATA_FIELD_LIST dfl ON dfl.DATA_FIELD_BO = df.HANDLE AND dfl.DATA_VALUE = zab.PRODUCT_CATEGORY
+                 INNER JOIN DATA_FIELD df ON df.DATA_FIELD = 'WORK_ORDER'
+                 LEFT JOIN DATA_FIELD_LIST dfl ON dfl.DATA_FIELD_BO = df.HANDLE AND dfl.DATA_VALUE = zab.WORK_ORDER
                  LEFT JOIN DATA_FIELD_LIST_T dflt ON dflt.DATA_FIELD_LIST_BO = dfl.HANDLE AND dflt.LOCALE = #{locale}
             <where>
                 zsd.SITE = #{site}
@@ -703,10 +703,10 @@
                 <if test="itemNumber != null and itemNumber != ''">
                     AND cf.VALUE = #{itemNumber}
                 </if>
-                <if test="productCategory != null and productCategory != ''">
-                    AND  (dflt.DATA_TAG = #{productCategory} OR
-                         zab.PRODUCT_CATEGORY = #{productCategory} OR
-                         cf2.VALUE = #{productCategory}
+                <if test="workOrder != null and workOrder != ''">
+                    AND  (dflt.DATA_TAG = #{workOrder} OR
+                         zab.WORK_ORDER = #{workOrder} OR
+                         cf2.VALUE = #{workOrder}
                     )
                 </if>
                 <if test="shopOrder != null and shopOrder != ''">

dispatch/src/main/resources/mapper/SfcDispatchMapper.xml

@@ -717,6 +717,9 @@
                 <if test="item != null and item != ''">
                     AND IM.ITEM = #{item}
                 </if>
+                <if test="itemDescription !=null and itemDescription!=''">
+                    AND IT.DESCRIPTION like '%' ||#{itemDescription}|| '%'
+                </if>
                 <if test="workOrder != null and workOrder != ''">
                     AND C1.VALUE LIKE '%' ||#{workOrder}|| '%'
                 </if>

meapi/src/main/resources/mapper/SfcMapper.xml

@@ -703,6 +703,7 @@
                 </when>
                 <otherwise>
                     AND T.SFC like '%${globalQuery}%'
+                    OR T.ITEM_BO LIKE '%${globalQuery}%'
                 </otherwise>
             </choose>
         </if>

production/src/main/resources/mapper/SfcCrossMapper.xml

@@ -93,7 +93,7 @@
         SELECT SO.SHOP_ORDER, SO_CF.VALUE ITEM_NUMBER, SO_CF2.VALUE WORK_ORDER,I.ITEM, IT.DESCRIPTION ITEM_DESC,
             CASE WHEN ST.STATUS='403' AND SS.QTY_IN_QUEUE > 0 THEN N'402' ELSE ST.STATUS END STATUS,
             OP.OPERATION, OT.DESCRIPTION OPERATION_DESC,OP.OPERATION||'/'||RS.STEP_ID OPERATION_STEP,
-            RO_CF2.VALUE TOOL ,SOD.HANDLE SFC_DISPATCH_DETAIL_BO,SOD.WORK_CENTER,
+            RO_CF2.VALUE TOOL ,SOD.HANDLE SFC_DISPATCH_DETAIL_BO,SOD.WORK_CENTER,SOD.PROD_HOURS,
             S.SFC,S.QTY SFC_QTY,RS.STEP_ID, SOD.DISPATCH_NO ,
             TO_CHAR( SOD.PLANNED_START_DATE + INTERVAL '8' HOUR,'yyyy-mm-dd hh24:mi:ss')START_DATE,
             TO_CHAR(SOD.PLANNED_COMP_DATE + INTERVAL '8' HOUR ,'yyyy-mm-dd hh24:mi:ss')COMP_DATE,
@@ -117,13 +117,13 @@
         INNER JOIN ITEM I ON I.HANDLE = S.ITEM_BO
         LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE =#{locale}
         INNER JOIN (
-            SELECT SD.HANDLE, SD.SFC,SD.RESRCE,SD.OPERATION,SD.STEP_ID,SD.PLANNED_COMP_DATE, SD.PLANNED_START_DATE,SD.DISPATCH_NO,SD.WORK_CENTER
+            SELECT SD.HANDLE, SD.SFC,SD.RESRCE,SD.OPERATION,SD.STEP_ID,SD.PLANNED_COMP_DATE, SD.PLANNED_START_DATE,SD.DISPATCH_NO,SD.WORK_CENTER,SD.PROD_HOURS
             FROM Z_PROD_READY_TASK RB
             INNER JOIN Z_SFC_DISPATCH SD ON SD.HANDLE = RB.SFC_DISPATCH_BO
             WHERE RB.SITE =#{site} AND RB.STATUS = 'FINISH' AND RB."RESULT"='OK'
         ) SOD ON SOD.RESRCE =#{dto.resrce} AND SOD.SFC= S.SFC AND SOD.OPERATION = OP.OPERATION and SS.STEP_ID=SOD.STEP_ID
         WHERE S.SITE = #{site} AND S.SFC = #{dto.sfc} AND ROWNUM=1
-        GROUP BY SO.SHOP_ORDER, SO_CF.VALUE , I.ITEM, IT.DESCRIPTION ,SOD.WORK_CENTER,SO_CF2.VALUE,
+        GROUP BY SO.SHOP_ORDER, SO_CF.VALUE , I.ITEM, IT.DESCRIPTION ,SOD.WORK_CENTER,SO_CF2.VALUE,SOD.PROD_HOURS,
         CASE WHEN ST.STATUS='403' AND SS.QTY_IN_QUEUE > 0 THEN N'402' ELSE ST.STATUS END,
         OP.OPERATION, OT.DESCRIPTION ,OP.OPERATION||'/'||RS.STEP_ID  ,RO_CF2.VALUE,
         S.SFC,S.QTY ,RS.STEP_ID,SOD.DISPATCH_NO , SOD.HANDLE ,

production/src/main/resources/mapper/WorkShopTransferMapper.xml

@@ -643,6 +643,7 @@
      JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER  AND WC.SITE = zsd.SITE
      LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh'
      LEFT JOIN Z_SFC_DISPATCH PREZSD ON zsd.SFC=PREZSD.SFC AND PREZSD.DISPATCH_SEQ=TO_NUMBER(zsd.DISPATCH_SEQ)-1
+     LEFT JOIN Z_INSPECTION_TASK ZIT ON PREZSD.SFC=ZIT.SFC AND PREZSD.STEP_ID=ZIT.STEP_ID
      LEFT JOIN Z_WORK_SHOP_TRANSFER ZWST ON zsd.HANDLE=zwst.SFC_DISPATCH_BO
      INNER JOIN SHOP_ORDER SO ON SO.SITE = zsd.SITE AND SO.SHOP_ORDER = zsd.SHOP_ORDER
      JOIN OPERATION OP ON OP.OPERATION = zsd.OPERATION AND OP.SITE = ZSD.SITE AND OP.CURRENT_REVISION = 'true'
@@ -654,6 +655,7 @@
      LEFT JOIN OPERATION PREOP ON PREOP.OPERATION = zsd.PREPOSITION_OPERATION AND PREOP.SITE = ZSD.SITE AND PREOP.CURRENT_REVISION = 'true'
      LEFT JOIN OPERATION_T PREOT ON PREOT.OPERATION_BO = PREOP.HANDLE AND PREOT.LOCALE ='zh'
      WHERE ZSD.SITE=#{site} AND (zsd.DISPATCH_STATUS='RELEASE' OR zsd.DISPATCH_STATUS='NEW') AND PREZSD.DISPATCH_STATUS='COMPLETE'
+     AND ZIT.RESULT='OK'
     <if test="stepId!=null and stepId!=''">
         AND zsd.STEP_ID=#{stepId}
     </if>