修改排产

zkqy-custom-business/src/main/java/com/zkqy/business/controller/ProductCodeListController.java

@@ -11,6 +11,7 @@ import com.zkqy.business.domain.ProductWarehousingRecord;
 import com.zkqy.business.domain.vo.NewOldProductCodeListVO;
 import com.zkqy.business.domain.vo.ProductCodeListVO;
 import com.zkqy.business.mapper.ProductCodeListMapper;
+import com.zkqy.business.mapper.ProductWarehousingRecordMapper;
 import com.zkqy.business.service.*;
 import com.zkqy.common.utils.PageUtils;
 import com.zkqy.common.utils.SecurityUtils;
@@ -54,6 +55,9 @@ public class ProductCodeListController extends BaseController {
 
     @Autowired
     private ProductCodeListMapper productCodeListMapper;
+
+    @Autowired
+    private ProductWarehousingRecordMapper productWarehousingRecordMapper;
     /**
      * 查询产品码单列表
      */
@@ -219,6 +223,7 @@ public class ProductCodeListController extends BaseController {
             for(int i = 0;i<ids.length;i++){
                 Long id = Long.valueOf(ids[i]);
                 ProductCodeAList historyproductCodeAList = productCodeAListService.selectProductCodeAListById(id);
+                productWarehousingRecordMapper.deleteProductWarehousingRecordByqrcodeID(historyproductCodeAList.getQrCodeId());
                 ProductCodeLog productCodeLog = new ProductCodeLog();
                 BeanUtils.copyProperties(historyproductCodeAList,productCodeLog);
                 productCodeLog.setId(null);

zkqy-custom-business/src/main/java/com/zkqy/business/mapper/ProductWarehousingRecordMapper.java

@@ -99,6 +99,14 @@ public interface ProductWarehousingRecordMapper {
      */
     public int deleteProductWarehousingRecordByUUID(String qrCodeId);
 
+    /**
+     * 新的删除成品入库记录信息
+     *
+     * @param qrCodeId 成品出库记录主键
+     * @return 结果
+     */
+    public int deleteProductWarehousingRecordByqrcodeID(String qrCodeId);
+
     /**
      * 统计产量---年月日季度查询
      *

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductCodeListServiceImpl.java

@@ -310,6 +310,10 @@ public class ProductCodeListServiceImpl implements IProductCodeListService {
         return productCodeListMapper.deleteProductCodeListById(id);
     }
 
+    /**
+     * 点击机台查询机台排产列表
+     *
+     */
     @Override
     public List<ProductCodeListVO> selectFinishedProduct(ProductCodeList productCodeList) {
         ProductionLine pr = new ProductionLine();

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

@@ -498,7 +498,7 @@
     <select id="selectFinishedProductfkltfs" resultType="com.zkqy.business.domain.vo.ProductCodeListVO">
         SELECT
         sp.id as id,
-        sp.lot_number AS lotNum,
+        dpsl.current_lot_number AS lotNum,
         p.product_name AS productName,
         p.product_specifications AS productSpecifications,
         sp.colours AS productColor,
@@ -515,6 +515,7 @@
         LEFT JOIN {DBNAME}.sale_craft sc ON sp.sale_order_no = sc.sale_order_no
         left join {DBNAME}.materiel ml on sp.colour_number = ml.materiel_code
         LEFT JOIN {DBNAME}.details_of_the_refueling_plan_spinning dps ON sp.sale_order_no = dps.salesman_id
+        LEFT JOIN {DBNAME}.details_of_the_refueling_plan_spinning_logs dpsl ON sp.sale_order_no = dpsl.order_id
         LEFT JOIN {DBNAME}.production_line pl ON dps.machine_id = pl.production_line_no AND pl.del_flag = '0'
         WHERE
         sp.del_flag = '0'
@@ -523,7 +524,8 @@
         and ml.del_flag = '0'
         and sp.status in ('4','6')
         <if test="machineTool != null">AND dps.mac_id = #{machineTool} AND FIND_IN_SET(#{machineTool}, sp.products_line_no_arry_id) > 0</if>
-        GROUP BY sp.id
+        GROUP BY
+        dpsl.current_lot_number
     </select>
 
 

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

@@ -371,6 +371,11 @@
         where qr_code_id = #{qrCodeId}
     </delete>
 
+    <delete id="deleteProductWarehousingRecordByqrcodeID" parameterType="string">
+        delete from {DBNAME}.product_warehousing_record
+        where qr_code_id = #{qrCodeId}
+    </delete>
+
     <select id="productionStatistics" resultType="map">
         SELECT
         a.*