fix:缓存线异常处理功能

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java

@@ -1,3 +1,4 @@
+/*
 
 package org.nl.wms.masterdata_manage.storage.controller.material;
 
@@ -7,8 +8,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.anno.Log;
-import org.nl.wms.masterdata_manage.备份st.service.StructrelamaterialService;
-import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelamaterialDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -17,10 +16,12 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
+*/
 /**
 * @author zhouz
 * @date 2021-12-09
-**/
+**//*
+
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "物料存放设置管理")
@@ -83,3 +84,4 @@ public class StructrelamaterialController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 }
+*/

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/CacheLineHandController.java

@@ -77,13 +77,11 @@ public class CacheLineHandController{
                 if (length < 5) {
                     throw new BizCoreException("输入条件所查询的内容过多，请输入大于4个字的查询条件。");
                 }
-               }
+            } else if (Pattern.compile("[\u4e00-\u9fa5]+").matcher(params).matches()) {
-               else if(Pattern.compile("[\u4e00-\u9fa5]+").matcher(params).matches()) {
                 if (length < 9) {
                     throw new BizCoreException("输入条件所查询的内容过多，请输入大于3个字的查询条件。");
                 }
-               }
+            } else if (length < 4) {
-               else if(length < 4) {
                 throw new BizCoreException("输入条件所查询的内容过多，请输入大于3个字的查询条件。");
             }
         }
@@ -177,7 +175,7 @@ public class CacheLineHandController{
     @PostMapping("/inOutExceptionInstQuery")
     @Log("缓存线扫码异常-查询")
     @ApiOperation("缓存线扫码异常-查询")
-     public ResponseEntity<JSONArray> inOutExceptionInstQuery(@RequestBody JSONObject param) {
+    public ResponseEntity<Object> inOutExceptionInstQuery(@RequestBody JSONObject param) {
         log.info("海亮缓存线手持服务 [缓存线扫码异常-查询] 接口被·请求, 请求参数-{}", param);
         //参数校验
         if (StringUtils.isBlank(param.getString("wcsdevice_code"))) {
@@ -324,7 +322,7 @@ public class CacheLineHandController{
     @PostMapping("/getCacheLineMaterialInfo")
     @Log("缓存线物料信息盘点")
     @ApiOperation("缓存线物料信息盘点")
-     public ResponseEntity<JSONArray> getCacheLineMaterialInfo(@RequestBody JSONObject param) {
+    public ResponseEntity<Object> getCacheLineMaterialInfo(@RequestBody JSONObject param) {
         log.info("海亮缓存线手持服务 [缓存线盘点-缓存线物料信息盘点] 接口被请求, 请求参数-{}", param);
         return new ResponseEntity<>(cacheLineHandService.getCacheLineMaterialInfo(param), HttpStatus.OK);
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/CacheLineHandService.java

@@ -134,7 +134,7 @@ public interface CacheLineHandService{
       * @author gbx
       * @date 2023/3/24
       */
-     JSONArray inOutExceptionInstQuery(JSONObject param);
+     List<Map> inOutExceptionInstQuery(JSONObject param);
 
      /**
       * 扫码异常确认
@@ -286,7 +286,7 @@ public interface CacheLineHandService{
       * @param param
       * @return
       */
-     JSONArray getCacheLineMaterialInfo(JSONObject param);
+     List<Map> getCacheLineMaterialInfo(JSONObject param);
 
      /**
       * 获取生产区域下拉框

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -25,6 +26,10 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.pda_manage.pda.dto.MaterialDto;
 import org.nl.wms.pda_manage.pda.service.CacheLineHandService;
+import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
+import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
+import org.nl.wms.scheduler_manage.service.cacheline.dao.mapper.SchCachelinePositionMapper;
+import org.nl.wms.scheduler_manage.service.cacheline.dao.mapper.SchCachelineVehilematerialMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.scheduling.annotation.Async;
@@ -39,7 +44,7 @@ import java.util.stream.Collectors;
 /**
  * CacheLineHandServiceImpl.java Description: 3中异常类型:
  * 1、比如要N个空箱子或N个满料料箱。查询出来以后，一个码都无法扫描出来，这时候标记这些箱子为异常
- * 2、箱码扫描不出来，则用手持经过WMS中转传输给WCS，最后给电器。
+ * 2、箱码扫描不出来，则用手持经过WMS中转传输给WCS，最后给电气。
  * 3、AGV搬运过程中异常（非AGVERR）,查询条件为设备、起始点等未完成的时候（有可能不是异常）。
  *
  * @date 2023/3/22
@@ -53,6 +58,12 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
     private LocalCache cache;
     @Autowired
     private WmsToAcsService wmsToAcsService;
+    @Autowired
+    private IPdmBiDeviceService deviceService;
+    @Autowired
+    private SchCachelineVehilematerialMapper vehilematerialMapper;
+    @Autowired
+    private SchCachelinePositionMapper positionMapper;
 
     @Override
     public JSONArray dropdownListQuery(String param, String type) {
@@ -246,8 +257,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
             JSONArray jsonArray = new JSONArray();
             jsonArray.add(taskObject);
             return RestBusinessTemplate.execute(() -> wmsToAcsService.issueTaskToAcs(jsonArray));
-          }
+        } else {
-          else{
             return null;
         }
     }
@@ -330,8 +340,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
                 //是否空位
                 if (StatusEnum.CACHE_VEL_NULL.getCode().equals(json.getString("is_empty"))) {
                     json.put("vehicle_status", StatusEnum.STATUS_FLASE.getCode());
-                    }
+                } else {
-                    else{
                     // 载具不是空位
                     String vehicle_code = json.getString("vehicle_code");
                     //从缓存线物料库存中 根据缓存线编码和载具编码获取绑定信息
@@ -339,8 +348,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
                     if (ivtObj == null) {
                         //标记为红色异常
                         json.put("vehicle_status", StatusEnum.CACHE_VEL_ERR.getCode());
-                         }
+                    } else {
-                         else{
                         json.put("vehicle_status", ivtObj.getString("vehicle_status"));
                         json.put("weight", ivtObj.getString("weight"));
                         json.put("quantity", ivtObj.getString("quantity"));
@@ -637,8 +645,8 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
      * 缓存线扫码异常-查询
      */
     @Override
-     public JSONArray inOutExceptionInstQuery(JSONObject param) {
+    public List<Map> inOutExceptionInstQuery(JSONObject param) {
-          return WQL.getWO("PDA_QUERY").addParamMap(MapOf.of("cacheline_code", param.getString("wcsdevice_code"), "flag", "12")).process().getResultJSONArray(0);
+        return vehilematerialMapper.getErrorVeh(param.getString("wcsdevice_code"));
     }
 
     /**
@@ -671,8 +679,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
         jsonArray.add(jsonObject);
         try {
             return RestBusinessTemplate.execute(() -> AcsUtil.notifyAcs("api/wms/issuedBarcode", jsonArray));
-          }
+        } catch (NullPointerException e) {
-          catch(NullPointerException e) {
             throw new BadRequestException(e.toString());
         }
     }
@@ -700,8 +707,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
         jsonArray.add(jsonObject);
         try {
             return RestBusinessTemplate.execute(() -> AcsUtil.notifyAcs("api/wms/puaseCacheLine", jsonArray));
-          }
+        } catch (NullPointerException e) {
-          catch(NullPointerException e) {
             throw new BadRequestException(e.toString());
         }
     }
@@ -770,8 +776,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
         WQLObject instructTab = WQLObject.getWQLObject("sch_base_task");
         if (StringUtils.isBlank(vehicle_code)) {
             arr = instructTab.query("point_code1 = '" + wcsdevice_code + "'  and task_status <> '7'").getResultJSONArray(0);
-          }
+        } else {
-          else{
             arr = instructTab.query("point_code1 = '" + wcsdevice_code + "' and vehicle_code = '" + vehicle_code + "' and task_status <> '7'").getResultJSONArray(0);
         }
         JSONArray result = new JSONArray();
@@ -824,30 +829,38 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
         jsonArray.add(jsonObject);
         try {
             return RestBusinessTemplate.execute(() -> new JSONObject());
-          }
+        } catch (NullPointerException e) {
-          catch(NullPointerException e) {
             throw new BadRequestException(e.toString());
         }
     }
 
     @Override
     public JSONArray getCacheLine(JSONObject param) {
-          // 生产区域
+        QueryWrapper<PdmBiDevice> wrapper = new QueryWrapper<>();
         String product_area = param.getString("product_area");
-          return WQL.getWO("PDA_QUERY").addParamMap(MapOf.of("flag", "7", "product_area", product_area)).process().getResultJSONArray(0);
+        if (StrUtil.isNotEmpty(product_area)) {
+            wrapper.eq("product_area", product_area);
+        }
+        List<PdmBiDevice> device_list = deviceService.list(wrapper.like("device_code", "HCX"));
+        JSONArray ja = new JSONArray();
+        device_list.forEach(device -> {
+            JSONObject jo = new JSONObject();
+            jo.put("value", device.getDevice_code());
+            jo.put("text", device.getDevice_name());
+            ja.add(jo);
+        });
+        // 生产区域
+
+        return ja;
     }
 
     @Override
-     public JSONArray getCacheLineMaterialInfo(JSONObject param) {
+    public List<Map> getCacheLineMaterialInfo(JSONObject param) {
         // 缓存线编码 point_code
         String pointCode = param.getString("wcsdevice_code");
         String productArea = param.getString("product_area");
-          AtomicReference<JSONArray> res = new AtomicReference<>(new JSONArray());
+
-          RedissonUtils.lock(() -> {
+        return positionMapper.getPositionInfo(MapOf.of("product_area", productArea, "cacheline_code", pointCode));
-               // 生产区域
-               res.set(WQL.getWO("PDA_QUERY").addParamMap(MapOf.of("flag", "8", "product_area", productArea, "cacheline_code", pointCode)).process().getResultJSONArray(0));
-          }, pointCode, 3);
-          return res.get();
     }
 
     @Override

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/wql/PDA_QUERY.wql

@@ -173,17 +173,17 @@
     IF 输入.flag = "7"
         QUERY
             SELECT
-            	p.point_code as value,
+            	device_code AS value,
-            	p.point_name as text
+            	device_name AS text
             FROM
-            	sch_base_point p
+            	pdm_bi_device
             WHERE
-                p.region_code = 'A1_HCX'
+            	device_code like '%HCX%'
             OPTION 输入.product_area <> ""
-            	    p.product_area = 输入.product_area
+                product_area = 输入.product_area
             ENDOPTION
             ORDER BY
-            	p.point_code
+                device_code
             ENDSELECT
         ENDQUERY
     ENDIF
@@ -210,13 +210,9 @@
             	LEFT JOIN sch_cacheline_vehilematerial ON sch_cacheline_position.vehicle_code = sch_cacheline_vehilematerial.vehicle_code
             	LEFT JOIN md_me_materialbase ON md_me_materialbase.material_id = sch_cacheline_vehilematerial.material_id
             WHERE
-                1 = 1
-                OPTION 输入.product_area <> ""
                 sch_cacheline_position.product_area = 输入.product_area
-            	ENDOPTION
+            AND
-            	OPTION 输入.cacheline_code <> ""
                 sch_cacheline_position.cacheline_code = 输入.cacheline_code
-            	ENDOPTION
             ORDER BY
             	sch_cacheline_position.cacheline_code, sch_cacheline_position.layer_num, sch_cacheline_position.positionorder_no, sch_cacheline_position.cache_line_no
             ENDSELECT

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/SchCachelinePositionMapper.java

@@ -1,8 +1,12 @@
 package org.nl.wms.scheduler_manage.service.cacheline.dao.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.nl.wms.scheduler_manage.service.cacheline.dao.SchCachelinePosition;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 缓存线位置表 Mapper 接口
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SchCachelinePositionMapper extends BaseMapper<SchCachelinePosition> {
 
+    List<Map> getPositionInfo(@Param("map") Map map);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/SchCachelineVehilematerialMapper.java

@@ -1,8 +1,12 @@
 package org.nl.wms.scheduler_manage.service.cacheline.dao.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.nl.wms.scheduler_manage.service.cacheline.dao.SchCachelineVehilematerial;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 缓存线载具物料表 Mapper 接口
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SchCachelineVehilematerialMapper extends BaseMapper<SchCachelineVehilematerial> {
 
+    List<Map> getErrorVeh(@Param("cacheline_code") String cacheline_code);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelinePositionMapper.xml

@@ -2,4 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.scheduler_manage.service.cacheline.dao.mapper.SchCachelinePositionMapper">
 
+    <select id="getPositionInfo" resultType="java.util.Map">
+        SELECT
+			scp.cacheline_code,
+			scp.position_code,
+			scp.position_name,
+			scp.vehicle_code,
+			scp.layer_num,
+			scp.positionorder_no as seat_order_num,
+			sch_cacheline_vehilematerial.workprocedure_code,
+			sch_cacheline_vehilematerial.workprocedure_name,
+			sch_cacheline_vehilematerial.material_id as material_uuid,
+			mb.material_code,
+			mb.material_name,
+			mb.material_spec,
+			sch_cacheline_vehilematerial.quantity,
+			sch_cacheline_vehilematerial.weight,
+            IF(length(scp.vehicle_code) > 0, IFNULL(sch_cacheline_vehilematerial.vehicle_status, 4), 1) AS vehicle_status
+		FROM
+			sch_cacheline_position scp
+			LEFT JOIN sch_cacheline_vehilematerial ON scp.vehicle_code = sch_cacheline_vehilematerial.vehicle_code
+			LEFT JOIN md_me_materialbase mb ON mb.material_id = sch_cacheline_vehilematerial.material_id
+        <where>
+			scp.cacheline_code = #{map.cacheline_code}
+			<if test="map.product_area != null and map.product_area != ''">
+				and scp.product_area = #{map.product_area}
+			</if>
+		</where>
+            ORDER BY
+            	scp.cacheline_code, scp.layer_num, scp.positionorder_no, scp.cache_line_no
+    </select>
 </mapper>

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehilematerialMapper.xml

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.scheduler_manage.service.cacheline.dao.mapper.SchCachelineVehilematerialMapper">
 
+    <select id="getErrorVeh" resultType="java.util.Map">
+        SELECT
+            *
+           FROM
+            (
+            SELECT
+                v.vehicle_code,
+                p.position_code,
+                p.cacheline_code
+            FROM
+                sch_cacheline_vehilematerial v
+                LEFT JOIN sch_cacheline_position p ON v.vehicle_code = p.vehicle_code
+            WHERE
+                v.err_type = 2
+                AND v.is_delete = 0
+            ) a
+            <where>
+                <if test="cacheline_code != null and cacheline_code != ''">
+                    a.cacheline_code = #{cacheline_code}
+                </if>
+            </where>
+    </select>
 </mapper>

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java

@@ -59,8 +59,8 @@ public class StIvtIostorinvYlOutController {
     }
 
     @PostMapping("/getIODtl")
-    @Log("查询入库分配明细")
+    @Log("查询出库分配明细")
-    @ApiOperation("查询入库分配明细")
+    @ApiOperation("查询出库分配明细")
     public ResponseEntity<Object> getIODtl(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(iostorinvOutYlService.getInvDtl(whereJson), HttpStatus.OK);
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdtlYlService.java

@@ -24,7 +24,7 @@ public interface IStIvtIostorinvdtlYlService extends IService<StIvtIostorinvdtlY
      * @param iostorinvCp_id
      * @return
      */
-    double create(JSONArray row, String iostorinvCp_id);
+    double create(JSONArray row, String iostorinvCp_id,String io_type);
 
     List<Map> getDtlList(JSONObject json);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvYl.java

@@ -202,7 +202,7 @@ public class StIvtIostorinvYl implements Serializable {
     /**
      * 车间标识
      */
-    private String product_area;
+    private String workshop_id;
 
 
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml

@@ -19,6 +19,7 @@
         mst.total_qty,
         mst.detail_count,
         mst.bill_status,
+        mst.workshop_id,
         mst.remark,
         mst.create_id,
         mst.create_name,
@@ -28,12 +29,9 @@
         DATE_FORMAT( mst.update_time,'%Y-%m-%d %H:%i:%s') AS update_time,
         mst.confirm_id,
         mst.confirm_name,
-        DATE_FORMAT( mst.confirm_time,'%Y-%m-%d %H:%i:%s') AS confirm_time,
+        DATE_FORMAT( mst.confirm_time,'%Y-%m-%d %H:%i:%s') AS confirm_time
-        dis.struct_id,
-        dis.sect_id
         FROM
         st_ivt_iostorinv_yl mst
-        LEFT JOIN st_ivt_iostorinvdis_yl dis ON dis.iostorinv_id = mst.iostorinv_id
 	    <where>
             mst.is_delete = '0'
         AND

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml

@@ -30,7 +30,8 @@
         mst.confirm_name,
         DATE_FORMAT( mst.confirm_time,'%Y-%m-%d %H:%i:%s') AS confirm_time,
         dis.struct_id,
-        dis.sect_id
+        dis.sect_id,
+        mst.workshop_id
         FROM
         st_ivt_iostorinv_yl mst
         LEFT JOIN st_ivt_iostorinvdis_yl dis ON dis.iostorinv_id = mst.iostorinv_id

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java

@@ -30,6 +30,7 @@ import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlY
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdisYl;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl;
+import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvOutYlMapper;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper;
 import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery;
 import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService;
@@ -59,7 +60,7 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
     private IStIvtIostorinvdtlYlService iostorinvdtlYlService;
 
     @Autowired
-    private StIvtIostorinvYlMapper iostorinvYlMapper;
+    private StIvtIostorinvOutYlMapper ivtIostorinvOutYlMapper;
 
     @Autowired
     private IStIvtIostorinvdisYlService iostorinvdisYlService;
@@ -77,7 +78,7 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
     @Override
     public Object pageQuery(YlIostorInvQuery query, PageQuery pageQuery) {
         Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
-        List<Map> mst_detail = iostorinvYlMapper.getMstDetail(query, pageQuery);
+        List<Map> mst_detail = ivtIostorinvOutYlMapper.getMstDetail(query, pageQuery);
         TableDataInfo<Map> build = TableDataInfo.build(mst_detail);
         build.setTotalElements(page.getTotal());
         return build;
@@ -94,7 +95,7 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
         this.save(stIvtIostorinvYl);
 
         // 调用明细表 插入/更新方法
-        iostorinvdtlYlService.create(rows, stIvtIostorinvYl.getIostorinv_id());
+        iostorinvdtlYlService.create(rows, stIvtIostorinvYl.getIostorinv_id(), stIvtIostorinvYl.getIo_type());
     }
 
     @Override
@@ -109,7 +110,7 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
         JSONArray rows = form.getJSONArray("tableData");
         if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
         // 调用明细表 插入/更新方法
-        iostorinvdtlYlService.create(rows, form.getString("iostorinv_id"));
+        iostorinvdtlYlService.create(rows, form.getString("iostorinv_id"), mst.getIo_type());
         return mst.getIostorinv_id();
     }
 
@@ -138,56 +139,17 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
 
         StIvtIostorinvYl mst = this.getById(iostorinv_id);
 
-        List<StIvtIostorinvdisYl> dis_list = iostorinvdisYlService.list(new QueryWrapper<StIvtIostorinvdisYl>().eq("iostorinv_id", iostorinv_id));
         List<StIvtIostorinvdtlYl> dtl_list = iostorinvdtlYlService.list(new QueryWrapper<StIvtIostorinvdtlYl>().eq("iostorinv_id", iostorinv_id));
 
-        if (ObjectUtil.isEmpty(dis_list)) {
+        if (ObjectUtil.isEmpty(dtl_list)) {
-            throw new BadRequestException("该入库单不存在分配明细！");
+            throw new BadRequestException("该入库单不存在明细！");
         }
 
         if (mst == null || mst.getIs_delete() == true) {
             throw new BadRequestException("单据不存在");
         }
 
-        //修改分配状态
-        dis_list.forEach(dis -> {
-            dis.setReal_qty(dis.getPlan_qty());
-            dis.setWork_status(IOSEnum.WORK_STATUS.code("完成"));
-            iostorinvdisYlService.updateById(dis);
 
-            //修改库存和插入库存变动记录表
-            structivtflowService.recordStructivtFlow(
-                    StIvtStructivtflowDto.builder()
-                            .bill_code(mst.getBill_code()).change_type_scode(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_CONFIRM).bill_table("st_ivt_iostorinv_bcp")
-                            .material_id(dis.getMaterial_id()).pcsn(dis.getPcsn())
-                            .struct_code(dis.getStruct_code()).result_qty(structivtYlService.getOne(new QueryWrapper<StIvtStructivtYl>().eq("struct_code", dis.getStruct_code())).getCanuse_qty()).change_qty(dis.getReal_qty())
-                            .task_id(dis.getTask_id())
-                            .storagevehicle_code(dis.getStoragevehicle_code())
-                            .build()
-            );
-        });
-
-        //修改明细状态
-        dtl_list.forEach(dtl -> {
-            dtl.setReal_qty(dtl.getPlan_qty());
-            dtl.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
-            iostorinvdtlYlService.updateById(dtl);
-
-            //如果单据类型为原料入库
-            if (mst.getBill_type().equals(IOSEnum.BILL_TYPE.code("原料入库"))) {
-                JSONObject pur_jo = new JSONObject();
-                pur_jo.put("po_code", dtl.getSource_bill_code());
-                pur_jo.put("instor_qty", dtl.getReal_qty());
-                purchaseorderService.updatePurchaseNum(pur_jo);
-            }
-        });
-
-        //修改主表
-        mst.setConfirm_id(SecurityUtils.getCurrentUserId());
-        mst.setConfirm_name(SecurityUtils.getCurrentNickName());
-        mst.setConfirm_time(DateUtil.now());
-        mst.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
-        this.updateById(mst);
 
     }
 
@@ -198,7 +160,7 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
             // 新增
             stIvtIostorinvYl.setIostorinv_id(IdUtil.getStringId());
             stIvtIostorinvYl.setBill_code(CodeUtil.getNewCode("IO_CODE"));
-            stIvtIostorinvYl.setIo_type(IOSEnum.IO_TYPE.code("入库"));
+            stIvtIostorinvYl.setIo_type(IOSEnum.IO_TYPE.code("出库"));
             stIvtIostorinvYl.setBuss_type(whereJson.getString("bill_type"));
             stIvtIostorinvYl.setBill_type(stIvtIostorinvYl.getBuss_type());
             stIvtIostorinvYl.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
@@ -234,6 +196,7 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl<StIvtIostorinvYl
         stIvtIostorinvYl.setTotal_qty(whereJson.getBigDecimal("total_qty"));
         stIvtIostorinvYl.setDetail_count(rows.size());
         stIvtIostorinvYl.setRemark(whereJson.getString("remark"));
+        stIvtIostorinvYl.setWorkshop_id(whereJson.getString("workshop_id"));
 
         return stIvtIostorinvYl;
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java

@@ -95,7 +95,7 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl<StIvtIostorinvYlMap
         this.save(stIvtIostorinvYl);
 
         // 调用明细表 插入/更新方法
-        iostorinvdtlYlService.create(rows, stIvtIostorinvYl.getIostorinv_id());
+        iostorinvdtlYlService.create(rows, stIvtIostorinvYl.getIostorinv_id(), stIvtIostorinvYl.getIo_type());
     }
 
     @Override
@@ -110,7 +110,7 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl<StIvtIostorinvYlMap
         JSONArray rows = form.getJSONArray("tableData");
         if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
         // 调用明细表 插入/更新方法
-        iostorinvdtlYlService.create(rows, form.getString("iostorinv_id"));
+        iostorinvdtlYlService.create(rows, form.getString("iostorinv_id"), mst.getIo_type());
         return mst.getIostorinv_id();
     }
 
@@ -235,6 +235,7 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl<StIvtIostorinvYlMap
         stIvtIostorinvYl.setTotal_qty(whereJson.getBigDecimal("total_qty"));
         stIvtIostorinvYl.setDetail_count(rows.size());
         stIvtIostorinvYl.setRemark(whereJson.getString("remark"));
+        stIvtIostorinvYl.setWorkshop_id(whereJson.getString("workshop_id"));
 
         return stIvtIostorinvYl;
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdtlYlServiceImpl.java

@@ -36,14 +36,16 @@ public class StIvtIostorinvdtlYlServiceImpl extends ServiceImpl<StIvtIostorinvdt
     private IStIvtIostorinvdisYlService iostorinvdisYlService;
 
     @Override
-    public double create(JSONArray rows, String iostorinvYl_id) {
+    public double create(JSONArray rows, String iostorinvYl_id, String io_type) {
         double total_qty = 0;
 
         if (rows.size() > 0 && StringUtils.isNotEmpty(iostorinvYl_id)) {
             // 先删除在插入
             this.remove(new QueryWrapper<StIvtIostorinvdtlYl>().eq("iostorinv_id", iostorinvYl_id));
+            if (io_type.equals(IOSEnum.IO_TYPE.code("入库"))) {
                 //删除分配记录
                 iostorinvdisYlService.deleteById(iostorinvYl_id);
+            }
 
             for (int i = 0; i < rows.size(); i++) {
                 String iostorinvdtlYl_id = IdUtil.getStringId();
@@ -60,9 +62,11 @@ public class StIvtIostorinvdtlYlServiceImpl extends ServiceImpl<StIvtIostorinvdt
                 JSONObject mst_jo = new JSONObject();
                 mst_jo.put("mst_id", iostorinvYl_id);
                 mst_jo.put("dtl_id", iostorinvdtlYl_id);
+                if (io_type.equals(IOSEnum.IO_TYPE.code("入库"))) {
                     iostorinvdisYlService.create(rows.getJSONObject(i), mst_jo);
                 }
             }
+        }
         return total_qty;
     }
 

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue

@@ -248,6 +248,7 @@ const defaultForm = {
   struct_id: '',
   bill_type: '',
   remark: '',
+  workshop_id: '',
   biz_date: new Date(),
   create_mode: '',
   tableData: []
@@ -419,7 +420,6 @@ export default {
     tableChanged(rows) {
       // 对新增的行进行校验不能存在相同物料批次
       rows.forEach((item) => {
-        debugger
         let same_mater = true
         this.form.tableData.forEach((row) => {
           if (row.material_code === item.material_code) {

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDialog.vue

@@ -203,7 +203,7 @@
       </el-table-column>
     </el-table>
 
-    <StructIvt
+    <MaterDtl
       :dialog-show.sync="materShow"
       :is-single="false"
       @setMaterValue="tableChanged"
@@ -237,6 +237,7 @@ const defaultForm = {
   stor_id: '',
   struct_id: '',
   bill_type: '',
+  workshop_id: '',
   remark: '',
   biz_date: new Date(),
   create_mode: '',
@@ -301,7 +302,7 @@ export default {
     },
     [CRUD.HOOK.afterToEdit]() {
       // 获取入库单明细
-      crudProductIn.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
+      crudProductOut.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
@@ -310,25 +311,6 @@ export default {
         }
       })
     },
-    [CRUD.HOOK.beforeToEdit]() {
-      this.struct_id = this.crud.form.struct_id
-      this.sect_id = this.crud.form.sect_id
-      crudStructattr.getSectCascader({'stor_id': this.crud.form.stor_id}).then(res => {
-        this.sects = res.content
-        this.form.struct_id = this.search(this.sects, this.struct_id)
-      })
-    },
-    [CRUD.HOOK.afterToView]() {
-      crudProductIn.getIODtl({'bill_code': this.form.bill_code}).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
-    },
-
     [CRUD.HOOK.beforeSubmit]() {
       // 提交前校验
       if (this.form.tableData.length === 0) {
@@ -360,16 +342,6 @@ export default {
         this.sects = res.content
       })
     },
-    search(object, value) {
-      debugger
-      for (var key in object) {
-        if (object[key].value == value) return [object[key].value];
-        if (object[key].children && Object.keys(object[key].children).length > 0) {
-          var temp = search(object[key].children, value);
-          if (temp) return [object[key].value, temp].flat();
-        }
-      }
-    },
     sectQueryChange(val) {
       debugger
       this.sectProp = val
@@ -404,10 +376,9 @@ export default {
     tableChanged(rows) {
       // 对新增的行进行校验不能存在相同物料批次
       rows.forEach((item) => {
-        debugger
         let same_mater = true
         this.form.tableData.forEach((row) => {
-          if (row.material_code === item.material_code && row.struct_id === item.struct_id) {
+          if (row.material_code === item.material_code) {
             same_mater = false
           }
         })
@@ -415,7 +386,9 @@ export default {
           item.quality_scode = '01'
           item.ivt_level = '01'
           item.is_active = '1'
-          item.plan_qty = item.canuse_qty
+          item.plan_qty = '1'
+          item.qty_unit_id = item.base_unit_id
+          item.qty_unit_name = item.base_unit_name
           this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
           this.form.tableData.splice(-1, 0, item)
         }

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog.vue

@@ -45,7 +45,7 @@
           @change="crud.toQuery"
         >
           <el-option
-            v-for="item in dict.ST_INV_IN_TYPE"
+            v-for="item in dict.ST_INV_OUT_TYPE"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -130,7 +130,7 @@ export default {
   name: 'ViewDialog',
   components: {},
   mixins: [crud()],
-  dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS'],
+  dicts: ['ST_INV_OUT_TYPE', 'product_area', 'IO_BILL_STATUS'],
   props: {
     dialogShow: {
       type: Boolean,

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue

@@ -42,7 +42,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.ST_INV_IN_TYPE"
+                v-for="item in dict.ST_INV_OUT_TYPE"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -233,7 +233,7 @@ export default {
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area', 'ST_INV_CREATE'],
+  dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE', 'product_area', 'ST_INV_CREATE'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -306,7 +306,7 @@ export default {
       }
     },
     bill_typeFormat(row, column) {
-      return this.dict.label.ST_INV_IN_TYPE[row.bill_type]
+      return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
     },
     toView(row) {
       this.mstrow = row

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/productOut',
+    url: '/api/out/stIvtIostorinvYl',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/productOut/',
+    url: '/api/out/stIvtIostorinvYl/',
     method: 'delete',
     data: ids
   })
@@ -18,211 +18,211 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/productOut',
+    url: '/api/out/stIvtIostorinvYl/update',
-    method: 'put',
-    data
-  })
-}
-
-export function getOutBillDtl(data) {
-  return request({
-    url: '/api/productOut/getOutBillDtl',
     method: 'post',
     data
   })
 }
-export function getOutBillDis(data) {
+
+export function getIODtl(data) {
   return request({
-    url: '/api/productOut/getOutBillDis',
+    url: '/api/out/stIvtIostorinvYl/getIODtl',
+    method: 'post',
+    data
+  })
+}
+export function getIODis(data) {
+  return request({
+    url: '/api/out/stIvtIostorinvYl/getIODis',
     method: 'post',
     data
   })
 }
 export function getOutBillDisDtl(params) {
   return request({
-    url: '/api/productOut/getOutBillDisDtl',
+    url: '//api/out/stIvtIostorinvYl/getOutBillDisDtl',
     method: 'get',
     params
   })
 }
 export function getOutBillTask(params) {
   return request({
-    url: '/api/productOut/getOutBillTask',
+    url: '//api/out/stIvtIostorinvYl/getOutBillTask',
     method: 'get',
     params
   })
 }
 export function getInvTypes() {
   return request({
-    url: '/api/productOut/getInvTypes',
+    url: '//api/out/stIvtIostorinvYl/getInvTypes',
     method: 'get'
   })
 }
 export function insertDtl(data) {
   return request({
-    url: '/api/productOut/insertDtl',
+    url: '//api/out/stIvtIostorinvYl/insertDtl',
     method: 'post',
     data
   })
 }
 export function allDiv(data) {
   return request({
-    url: '/api/productOut/allDiv',
+    url: '//api/out/stIvtIostorinvYl/allDiv',
     method: 'post',
     data
   })
 }
 export function allDivOne(data) {
   return request({
-    url: '/api/productOut/allDivOne',
+    url: '//api/out/stIvtIostorinvYl/allDivOne',
     method: 'post',
     data
   })
 }
 export function allCancel(data) {
   return request({
-    url: '/api/productOut/allCancel',
+    url: '//api/out/stIvtIostorinvYl/allCancel',
     method: 'post',
     data
   })
 }
 export function oneCancel(data) {
   return request({
-    url: '/api/productOut/oneCancel',
+    url: '//api/out/stIvtIostorinvYl/oneCancel',
     method: 'post',
     data
   })
 }
 export function setPoint(data) {
   return request({
-    url: '/api/productOut/setPoint',
+    url: '//api/out/stIvtIostorinvYl/setPoint',
     method: 'post',
     data
   })
 }
 export function oneSetPoint(data) {
   return request({
-    url: '/api/productOut/oneSetPoint',
+    url: '//api/out/stIvtIostorinvYl/oneSetPoint',
     method: 'post',
     data
   })
 }
 export function getStructIvt(params) {
   return request({
-    url: '/api/productOut/getStructIvt',
+    url: '//api/out/stIvtIostorinvYl/getStructIvt',
     method: 'get',
     params
   })
 }
 export function manualDiv(data) {
   return request({
-    url: '/api/productOut/manualDiv',
+    url: '//api/out/stIvtIostorinvYl/manualDiv',
     method: 'post',
     data
   })
 }
 export function confirm(data) {
   return request({
-    url: '/api/productOut/confirm',
+    url: '//api/out/stIvtIostorinvYl/confirm',
     method: 'post',
     data
   })
 }
 export function issueTask(data) {
   return request({
-    url: '/api/productOut/issueTask',
+    url: '//api/out/stIvtIostorinvYl/issueTask',
     method: 'post',
     data
   })
 }
 export function finishTask(data) {
   return request({
-    url: '/api/productOut/finishTask',
+    url: '//api/out/stIvtIostorinvYl/finishTask',
     method: 'post',
     data
   })
 }
 export function cancleTaskfinish(data) {
   return request({
-    url: '/api/productOut/cancleTaskfinish',
+    url: '//api/out/stIvtIostorinvYl/cancleTaskfinish',
     method: 'post',
     data
   })
 }
 export function paramByCodeType(data) {
   return request({
-    url: '/api/productOut/paramByCodeType',
+    url: '//api/out/stIvtIostorinvYl/paramByCodeType',
     method: 'post',
     data
   })
 }
 export function schAreaType(data) {
   return request({
-    url: '/api/productOut/schAreaType',
+    url: '//api/out/stIvtIostorinvYl/schAreaType',
     method: 'post',
     data
   })
 }
 export function backConfirm(data) {
   return request({
-    url: '/api/productOut/backConfirm',
+    url: '//api/out/stIvtIostorinvYl/backConfirm',
     method: 'post',
     data
   })
 }
 export function getType() {
   return request({
-    url: '/api/productOut/getType',
+    url: '//api/out/stIvtIostorinvYl/getType',
     method: 'get'
   })
 }
 export function moneySubmit(data) {
   return request({
-    url: '/api/productOut/moneySubmit',
+    url: '//api/out/stIvtIostorinvYl/moneySubmit',
     method: 'post',
     data
   })
 }
 export function getDisNum(data) {
   return request({
-    url: '/api/productOut/getDisNum',
+    url: '//api/out/stIvtIostorinvYl/getDisNum',
     method: 'post',
     data
   })
 }
 export function queryBox(data) {
   return request({
-    url: '/api/productOut/queryBox',
+    url: '//api/out/stIvtIostorinvYl/queryBox',
     method: 'post',
     data
   })
 }
 export function getOutBillTask2(data) {
   return request({
-    url: '/api/productOut/getOutBillTask2',
+    url: '//api/out/stIvtIostorinvYl/getOutBillTask2',
     method: 'post',
     data
   })
 }
 export function cancelTask(data) {
   return request({
-    url: '/api/productOut/cancelTask',
+    url: '//api/out/stIvtIostorinvYl/cancelTask',
     method: 'post',
     data
   })
 }
 export function allSetPoint(data) {
   return request({
-    url: '/api/productOut/allSetPoint',
+    url: '//api/out/stIvtIostorinvYl/allSetPoint',
     method: 'post',
     data
   })
 }
 export function oneSetPoint2(data) {
   return request({
-    url: '/api/productOut/oneSetPoint2',
+    url: '//api/out/stIvtIostorinvYl/oneSetPoint2',
     method: 'post',
     data
   })
 }
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }
+export default { add, edit, del, allDiv, allCancel, getIODtl, getIODis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }