Merge remote-tracking branch 'origin/master'

op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml

@@ -212,7 +212,7 @@
         <!--,qcp.check_standard checkStandard-->
         from qc_check_type_project qctp
         left join qc_check_project qcp on qcp.id = qctp.project_id
-        where qctp.del_flag = '0' and qctp.status = '1'
+        where qctp.del_flag = '0' and qcp.del_flag = '0'
         and qctp.group_id = #{groupId}
         and qctp.type_id = #{typeId}
         order by qctp.sort

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java

@@ -313,7 +313,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
     public List<QcStaticTable> getXJCheckTableDetail(QcStaticTable qcStaticTable) {
 
         String groupId = qcStaticTableMapper.getGroupIdByOrderNo(qcStaticTable.getOrderNo());
-        if(StringUtils.isBlank(groupId) || groupId.indexOf("-")<0){
+        if(StringUtils.isBlank(groupId)){
             groupId = "3dc0655fea3449c59c76a01cc5b91565";
         }
         qcStaticTable.setGroupId(groupId);

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml

@@ -181,6 +181,7 @@
 		left join qc_check_project qcp on qcp.id = qctp.project_id
 		left join qc_project_type qpt on qpt.project_type_code = qcp.project_type
         where td.belong_to = #{recordId}
+          and td.del_flag = '0' and qctp.del_flag = '0' and qcp.del_flag = '0' and qpt.del_flag = '0'
         order by qctp.sort
 	</select>
     <select id="getTopInfo" resultType="com.op.quality.domain.QcCheckTaskProduce">

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml

@@ -54,6 +54,22 @@
                     CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
                 or CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120)
             )
+		  and qct.check_type != 'checkTypeCP'
+		group by qct.check_type,qc.check_name
+        union all
+        select qct.check_type checkType,
+               qc.check_name checkName,
+               count(0) taskNum,
+               '检验任务' attr1
+        from qc_check_task qct
+                 left join qc_check_type qc on qct.check_type = qc.order_code
+                 left join qc_check_task_user qctu on qctu.belong_to = qct.record_id
+        where qct.check_status = '0' and qctu.check_man_code = #{checkManCode}
+          and (
+                    CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
+                or CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),DATEADD(DAY, -15, GETDATE()), 120)
+            )
+          and qct.check_type = 'checkTypeCP'
         group by qct.check_type,qc.check_name
         union all
 		select '','',

op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml

@@ -286,9 +286,12 @@
                  qct.material_code like concat('%', #{materialCode},'%') or qct.material_name like concat('%', #{materialCode},'%')
                 )
             </if>
-            <if test='delFlag == "0"'>
+            <if test='delFlag == "0" and checkType!="checkTypeCP"'>
                 and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
             </if>
+            <if test='delFlag == "0" and checkType=="checkTypeCP"'>
+                and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -15, GETDATE()), 120))
+            </if>
         </where>
         order by qct.create_time desc
     </select>

op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml

@@ -1400,9 +1400,10 @@
              ) t group by t.ymdms
     </select>
     <select id="getGroupIdByOrderNo" resultType="java.lang.String">
-        select bp.mvgr5
+        select qmg.id
         from pro_order_workorder pow
                  left join base_product bp on bp.product_code = pow.product_code
+                 left join qc_material_group qmg on qmg.group_code = bp.mvgr5
         where pow.workorder_code = #{orderNo}
     </select>
 

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

@@ -1549,6 +1549,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             for (OdsProcureOrder  order :
                     orderList1) {
                 OdsProcureOrder order2 = odsProcureOrderMapper.selectOdsProcureOrderByID(order.getID());
+                result1=result2.getMsg();
                 order2.setSapTempInfor(result2.getMsg());
                 order2.setSapTempStatus("0");//0是失败。1是成功
                 odsProcureOrderMapper.updateOdsProcureOrder(order2);
@@ -1794,6 +1795,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     public  List<OdsProcureOrder>  selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder) {
         //送货单，采购单，行项目，物料编码，物料名称，工厂号，托盘，状态，实际收货
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
+
         List<OdsProcureOrder> orderList=  odsProcureOrderMapper.selectOdsProcureOrderCardTLTWO(odsProcureOrder);
         return orderList;
     }
@@ -3286,6 +3288,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
      * @return
      */
     @Override
+    @DS("#header.poolName")
     public String handleUpdateSAP105(List<OdsProcureOrder> odsProcureOrders) {
         String   result="操作成功";
         for (OdsProcureOrder    order:   odsProcureOrders){

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

@@ -660,6 +660,7 @@
             ods_procure_order_card card
         WHERE
             card.Procure_Code= #{procureCode}
+        and User_Defined10='0'
     </select>
     <select id="selectOdsProcureOrderList1" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
         SELECT