Merge remote-tracking branch 'origin/master'

op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java

@@ -602,19 +602,19 @@ public class MesReportWorkController extends BaseController {
 		public List<MesPrepareDetailDTO> getNewPrepareData(@RequestBody MesPrepareDetail mesPrepareDetail) {
 			return mesReportWorkService.getNewPrepareData(mesPrepareDetail);
 		}
-    /**删除新增的报工物料组成**/
+		/**删除新增的报工物料组成**/
-		@DeleteMapping("/deleteBomRowNow/{id}")
+			@DeleteMapping("/deleteBomRowNow/{id}")
-		public AjaxResult deleteBomRowNow(@PathVariable String id) {
+			public AjaxResult deleteBomRowNow(@PathVariable String id) {
-			return toAjax(mesReportWorkService.deleteBomRowNow(id));
+				return toAjax(mesReportWorkService.deleteBomRowNow(id));
+			}
+
+		/**删除报工数据**/
+		@DeleteMapping("/deleteReportNow/{reportCode}")
+		public AjaxResult deleteReportNow(@PathVariable String reportCode) {
+			return toAjax(mesReportWorkService.deleteReportNow(reportCode));
 		}
 
-	/**删除报工数据**/
+       //获取仓库下拉列表
-	@DeleteMapping("/deleteReportNow/{reportCode}")
-	public AjaxResult deleteReportNow(@PathVariable String reportCode) {
-		return toAjax(mesReportWorkService.deleteReportNow(reportCode));
-	}
-
-    //获取仓库下拉列表
 		@GetMapping("/getWarehouseList")
 		public List<MesReportWorkConsume> getWarehouseList(MesReportWorkConsume workConsume) {
 			List<MesReportWorkConsume> rlist = mesReportWorkService.getWarehouseList(workConsume);

op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java

@@ -51,6 +51,9 @@ public class MesReportWorkConsume extends BaseEntity {
     @Excel(name = "数量")
     private BigDecimal quantity;
 
+    private BigDecimal quantitySplit;
+    private BigDecimal quantitySplitBom;
+
     /**
      * 单位
      */
@@ -391,6 +394,22 @@ public class MesReportWorkConsume extends BaseEntity {
         return id;
     }
 
+    public BigDecimal getQuantitySplit() {
+        return quantitySplit;
+    }
+
+    public void setQuantitySplit(BigDecimal quantitySplit) {
+        this.quantitySplit = quantitySplit;
+    }
+
+    public BigDecimal getQuantitySplitBom() {
+        return quantitySplitBom;
+    }
+
+    public void setQuantitySplitBom(BigDecimal quantitySplitBom) {
+        this.quantitySplitBom = quantitySplitBom;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java

@@ -358,6 +358,9 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
         pTabs.setTitle("第"+i+"层工单物料损耗");
         mesReportWorkConsume.setParentOrder("0");
         List<MesReportWorkConsume> liblist0 = mesReportWorkConsumeMapper.getConsumeList(mesReportWorkConsume);
+        for(MesReportWorkConsume lib0:liblist0){
+            lib0.setQuantitySplitBom(lib0.getQuantity().divide(lib0.getQuantitySplit(),2,BigDecimal.ROUND_HALF_UP));
+        }
 
         if(!CollectionUtils.isEmpty(liblist0)){
             BigDecimal actPro = mesReportWorkConsumeMapper.getActAllProduct(mesReportWorkConsume);
@@ -375,6 +378,9 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
             sTabs.setTitle("第"+xh+"层工单物料损耗");
             mesReportWorkConsume.setWorkorderCode(sonWorkOrder.getWorkorderCode());
             List<MesReportWorkConsume> liblist = mesReportWorkConsumeMapper.getConsumeList(mesReportWorkConsume);
+            for(MesReportWorkConsume lib:liblist){
+                lib.setQuantitySplitBom(lib.getQuantity().divide(lib.getQuantitySplit(),2,BigDecimal.ROUND_HALF_UP));
+            }
             sTabs.setLibList(liblist);
             tabs.add(sTabs);
 

op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml

@@ -98,6 +98,7 @@
          left join mes_prepare mp on ow.workorder_code = mp.workorder_code
          left join mes_prepare_detail mpd on mp.prepare_id = mpd.prepare_id
         where ow.product_date = #{productDateStr}
+          and mpd.material_name not like '%白坯%' and mpd.material_name not like '%药液%'
           and mpd.recoil = #{recoil} and mp.del_flag = '0' and mpd.del_flag = '0'
         GROUP BY mpd.material_code,
                  mpd.material_name,

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml

@@ -111,7 +111,7 @@
 			mrwc.unit,
 			mrwc.create_time createTime,
 		    mrwc.recoil,
-            pow.workorder_code_sap workorderCodeSap,
+            pow.workorder_code_sap workorderCodeSap,pow.quantity_split quantitySplit,
 		    mrwc.attr1,
             mrwc.warehouse_code warehouseCode,
             mpd.quantity planQuantity,mpd.erfmg,mpd.erfme,

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java

@@ -521,4 +521,11 @@ public class QcCheckTaskIncomeController extends BaseController {
         task.setCheckType(taskInfo.getCheckType());
         return toAjax(qcCheckTaskIncomeService.changeTaskDetail(task));
     }
+
+    //获取仓库下拉列表
+    @GetMapping("/getWarehouseList")
+    public List<QcCheckTaskIncome> getWarehouseList(QcCheckTaskIncome task) {
+        List<QcCheckTaskIncome> rlist = qcCheckTaskIncomeService.getWarehouseList(task);
+        return rlist;
+    }
 }

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java

@@ -161,4 +161,6 @@ public interface QcCheckTaskIncomeMapper {
     void deleteTaskUser(String deleteIds);
 
     QcCheckTaskIncome getTaskInfoByRecordId(String recordId);
+
+    List<QcCheckTaskIncome> getWarehouseList();
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java

@@ -117,4 +117,6 @@ public interface IQcCheckTaskIncomeService {
     QcCheckTaskIncome getTaskInfoByRecordId(String recordId);
 
     int changeTaskDetail(QcCheckTaskIncome task);
+
+    List<QcCheckTaskIncome> getWarehouseList(QcCheckTaskIncome task);
 }

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

@@ -1352,6 +1352,12 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		return qcCheckTaskIncomeMapper.getOaUserId(getUserIdList);
 	}
 
+	@Override
+	@DS("#header.poolName")
+	public List<QcCheckTaskIncome> getWarehouseList(QcCheckTaskIncome task) {
+		return qcCheckTaskIncomeMapper.getWarehouseList();
+	}
+
 	public static void main(String args[]){
 		String str = "11,,22,";
 		System.out.println(str.split(",")[0]);

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

@@ -396,7 +396,7 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
                 new LinkedBlockingQueue<Runnable>());
         try {
             dateSources.forEach(dateSource -> {
-                if("ds_1000".equals(dateSource.get("poolName"))){
+                if(!"ds_999".equals(dateSource.get("poolName"))){
                     logger.info("++++++++++++" + dateSource.get("poolName") + "++++库存检验开始++++++++++");
                     Runnable run = () -> createCCFunc(dateSource.get("poolName"));
                     executorService.execute(run);

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

@@ -869,6 +869,12 @@
         from qc_check_task qct
         where qct.record_id in('${ids}')
     </select>
+    <select id="getWarehouseList" resultType="com.op.quality.domain.QcCheckTaskIncome">
+        select warehouse_code supplierCode,
+               warehouse_name supplierName
+        from base_warehouse
+        where active_flag = '1' and del_flag = '0'
+    </select>
 
     <!--批量更新原始表-->
     <update id="updateIncomeBatchList">

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

@@ -250,98 +250,67 @@
 		where CONVERT(varchar(10),create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
 	</select>
     <select id="getPutInOrder" resultType="com.op.quality.domain.QcCheckTaskIncome">
-        <!--
+        select * from(
-        select * from (
+        SELECT
-              SELECT
+        wms_raw_order_in_sn.user_defined5 AS orderNo,
-                  wms_raw_order_in_sn.user_defined5 AS orderNo,
+        wms_raw_order_in_sn.material_code AS materialCode,
-                  wms_raw_order_in_sn.material_code AS materialCode,
+        wms_raw_order_in_sn.material_desc AS materialName,
-                  wms_raw_order_in_sn.material_desc AS materialName,
+        COUNT ( wms_raw_order_in_sn.amount ) AS quality,
-                  COUNT(wms_raw_order_in_sn.amount) AS quality,
+        wms_raw_order_in.gmt_create incomeTime,
-                  wms_raw_order_in_sn.gmt_create incomeTime,
+        wms_raw_order_in_sn.wh_code supplierCode,
-                  wms_raw_order_in_sn.wh_code supplierCode,
+        base_warehouse.warehouse_name supplierName,
-                  base_warehouse.warehouse_name supplierName,
+        wms_raw_order_in_sn.user_defined4 unit
-                  wms_raw_order_in_sn.user_defined4 unit
+        FROM
-              FROM
+        wms_raw_order_in_sn
-                  wms_raw_order_in_sn
+        LEFT JOIN base_warehouse ON base_warehouse.warehouse_code= wms_raw_order_in_sn.wh_code
-                      LEFT JOIN base_warehouse ON	base_warehouse.warehouse_code=wms_raw_order_in_sn.wh_code
+        LEFT JOIN wms_raw_order_in ON wms_raw_order_in.dn_no= wms_raw_order_in_sn.user_defined5 and	wms_raw_order_in.material_code=wms_raw_order_in_sn.material_code
-              WHERE
+        WHERE
-                  wms_raw_order_in_sn.active_flag = '1'
+        wms_raw_order_in_sn.active_flag = '1' and wms_raw_order_in_sn.user_defined5 is not null
-              GROUP BY
+        GROUP BY
-                  wms_raw_order_in_sn.wh_code,
+        wms_raw_order_in_sn.wh_code,
-                  wms_raw_order_in_sn.user_defined5,
+        wms_raw_order_in_sn.user_defined5,
-                  wms_raw_order_in_sn.material_code,
+        wms_raw_order_in_sn.material_code,
-                  wms_raw_order_in_sn.material_desc,
+        wms_raw_order_in_sn.material_desc,
-                  wms_raw_order_in_sn.user_defined4,
+        wms_raw_order_in_sn.user_defined4,
-                  base_warehouse.warehouse_code,
+        base_warehouse.warehouse_code,
-                  base_warehouse.warehouse_name,
+        base_warehouse.warehouse_name,
-                  wms_raw_order_in_sn.gmt_create
+        wms_raw_order_in.gmt_create UNION ALL
-              union all
+        SELECT
-              SELECT
+        wms_fp_storage_news_sn.order_no,
-                  wms_fp_storage_news_sn.order_no,
+        wms_fp_storage_news_sn.product_name,
-                  wms_fp_storage_news_sn.product_name,
+        wms_fp_storage_news_sn.product_code,
-                  wms_fp_storage_news_sn.product_code,
+        SUM ( wms_fp_storage_news_sn.amount ) AS total_amount,
-                  SUM ( wms_fp_storage_news_sn.amount ) AS total_amount,
+        wms_fp_storage_news_sn.gmt_create,
-                  wms_fp_storage_news_sn.gmt_create,
+        wms_fp_storage_news_sn.wh_code ,
-                  wms_fp_storage_news_sn.wh_code ,
+        base_warehouse.warehouse_name,
-                  base_warehouse.warehouse_name,
+        wms_fp_storage_news_sn.user_defined3
-                  wms_fp_storage_news_sn.user_defined3
+        FROM
-              FROM
+        wms_fp_storage_news_sn
-                  wms_fp_storage_news_sn
+        LEFT JOIN base_warehouse ON base_warehouse.warehouse_code= wms_fp_storage_news_sn.wh_code
-                      LEFT JOIN	base_warehouse	ON	base_warehouse.warehouse_code=wms_fp_storage_news_sn.wh_code
+        WHERE
-              WHERE
+        wms_fp_storage_news_sn.active_flag = '1' and wms_fp_storage_news_sn.order_no is not null
-                  wms_fp_storage_news_sn.active_flag = '1'
+        GROUP BY
-              GROUP BY
+        wms_fp_storage_news_sn.order_no,
-                  wms_fp_storage_news_sn.order_no,
+        wms_fp_storage_news_sn.product_name,
-                  wms_fp_storage_news_sn.product_name,
+        wms_fp_storage_news_sn.product_code,
-                  wms_fp_storage_news_sn.product_code,
+        wms_fp_storage_news_sn.gmt_create,
-                  wms_fp_storage_news_sn.gmt_create,
+        wms_fp_storage_news_sn.user_defined3,
-                  wms_fp_storage_news_sn.user_defined3,
+        base_warehouse.warehouse_code,
-                  base_warehouse.warehouse_code,
+        base_warehouse.warehouse_name,
-                  base_warehouse.warehouse_name,
+        wms_fp_storage_news_sn.wh_code
-                  wms_fp_storage_news_sn.wh_code
         ) t
-           -->
+        where 1=1
-        <!--select t0.orderNo,
+        <if test="materialCode != null">and t.materialCode like concat('%',#{materialCode}, '%')</if>
-            t0.materialCode,
+        <if test="materialName != null">and t.materialName like concat('%',#{materialName}, '%')</if>
-            t0.materialName,
+        <if test="supplierCode != null">and t.supplierCode like concat('%',#{supplierCode}, '%')</if>
-            t0.quality,
+        <if test="supplierName != null ">and t.supplierName like concat('%',#{supplierName},'%')</if>
-            t0.incomeTime,
+
-            t0.supplierCode,
+        order by t.incomeTime desc,t.materialCode
-            t0.supplierName,
+
-            t0.check_Type
-        from (-->
-            select
-               SUBSTRING(pow.workorder_code_sap,4,10) workorderCodeSap,
-                t.order_no orderNo,
-                t.material_code materialCode,
-                t.material_name materialName,
-                t.quality quality,
-                t.income_time incomeTime,
-                t.supplier_code supplierCode,
-                t.supplier_name supplierName,
-                t.check_type check_Type,
-                bp.warehouse_cycle,
-                case when qct.create_time is not null then DATEDIFF(day, qct.create_time, GETDATE())
-                else DATEDIFF(day, t.income_time, GETDATE()) end days
-            from qc_check_task t
-            left join base_product_attached bp on t.material_code = concat('0000000',bp.product_code)
-            left join (
-                select  order_no,material_code,max(create_time) create_time
-                from qc_check_task where check_type='checkTypeCC' and del_flag = '0' GROUP BY order_no,material_code
-            ) qct on qct.order_no = t.order_no and t.material_code = qct.material_code
-            left join pro_order_workorder pow on pow.workorder_code = qct.order_no
-            where bp.warehouse_cycle is not null and t.check_type in('checkTypeLL','checkTypeCP') and t.del_flag = '0' and pow.del_flag = '0'
-                <if test="materialCode != null">and t.material_code like concat('%',#{materialCode}, '%')</if>
-                <if test="materialName != null">and t.material_name like concat('%',#{materialName}, '%')</if>
-                <if test="orderNo != null">and t.order_no like concat('%',#{orderNo}, '%')</if>
-                <if test="workorderCodeSap != null ">and pow.workorder_code_sap like concat('%',#{workorderCodeSap},'%')</if>
-        order by t.income_time desc,t.order_no,t.material_code
-        <!--
-            )t0
-        where t0.days >= t0.warehouse_cycle -->
     </select>
 
     <select id="getPutInOrderList" resultType="com.op.quality.domain.QcCheckTaskInventory">
+<!--
         select t0.orderNo,
                t0.materialCode,
                t0.materialName,
@@ -372,7 +341,67 @@
                  where bp.warehouse_cycle is not null and t.check_type in('checkTypeLL','checkTypeCP') and t.del_flag = '0'
              )t0
         where t0.days >= t0.warehouse_cycle
-
+-->
+        select t0.orderNo,
+        t0.materialCode,
+        t0.materialName,
+        t0.quality,
+        t0.incomeTime,
+        t0.supplierCode,
+        t0.supplierName,
+        bp.warehouse_cycle,
+        DATEDIFF(day, t0.incomeTime, GETDATE()) days
+        from (
+        SELECT
+        wms_raw_order_in_sn.user_defined5 AS orderNo,
+        wms_raw_order_in_sn.material_code AS materialCode,
+        wms_raw_order_in_sn.material_desc AS materialName,
+        COUNT ( wms_raw_order_in_sn.amount ) AS quality,
+        wms_raw_order_in.gmt_create incomeTime,
+        wms_raw_order_in_sn.wh_code supplierCode,
+        base_warehouse.warehouse_name supplierName,
+        wms_raw_order_in_sn.user_defined4 unit
+        FROM
+        wms_raw_order_in_sn
+        LEFT JOIN base_warehouse ON base_warehouse.warehouse_code= wms_raw_order_in_sn.wh_code
+        LEFT JOIN wms_raw_order_in ON wms_raw_order_in.dn_no= wms_raw_order_in_sn.user_defined5 and	wms_raw_order_in.material_code=wms_raw_order_in_sn.material_code
+        WHERE
+        wms_raw_order_in_sn.active_flag = '1' and wms_raw_order_in_sn.user_defined5 is not null and wms_raw_order_in.gmt_create is not null
+        GROUP BY
+        wms_raw_order_in_sn.wh_code,
+        wms_raw_order_in_sn.user_defined5,
+        wms_raw_order_in_sn.material_code,
+        wms_raw_order_in_sn.material_desc,
+        wms_raw_order_in_sn.user_defined4,
+        base_warehouse.warehouse_code,
+        base_warehouse.warehouse_name,
+        wms_raw_order_in.gmt_create UNION ALL
+        SELECT
+        wms_fp_storage_news_sn.order_no,
+        wms_fp_storage_news_sn.product_name,
+        wms_fp_storage_news_sn.product_code,
+        SUM ( wms_fp_storage_news_sn.amount ) AS total_amount,
+        wms_fp_storage_news_sn.gmt_create,
+        wms_fp_storage_news_sn.wh_code ,
+        base_warehouse.warehouse_name,
+        wms_fp_storage_news_sn.user_defined3
+        FROM
+        wms_fp_storage_news_sn
+        LEFT JOIN base_warehouse ON base_warehouse.warehouse_code= wms_fp_storage_news_sn.wh_code
+        WHERE
+        wms_fp_storage_news_sn.active_flag = '1' and wms_fp_storage_news_sn.order_no is not null and wms_fp_storage_news_sn.gmt_create is not null
+        GROUP BY
+        wms_fp_storage_news_sn.order_no,
+        wms_fp_storage_news_sn.product_name,
+        wms_fp_storage_news_sn.product_code,
+        wms_fp_storage_news_sn.gmt_create,
+        wms_fp_storage_news_sn.user_defined3,
+        base_warehouse.warehouse_code,
+        base_warehouse.warehouse_name,
+        wms_fp_storage_news_sn.wh_code
+        )t0
+        left join base_product_attached bp on t0.materialCode = concat('0000000',bp.product_code)
+        where DATEDIFF(day, t0.incomeTime, GETDATE()) >= bp.warehouse_cycle
     </select>
 
     <insert id="insertQcCheckOaTask" parameterType="OACheckTaskDTO">