代码修改

mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/wql/QPF_SCREEN.wql

@@ -104,6 +104,8 @@
                 LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
             WHERE
                 dtl.material_type = '01'
+            AND
+                dtl.is_need_manage = '1'
             OPTION 输入.formula_id <> ""
                 dtl.formula_id = 输入.formula_id
             ENDOPTION
@@ -123,6 +125,8 @@
                 LEFT JOIN md_pb_classstandard mb ON mb.class_id = dtl.material_id
             WHERE
                 dtl.material_type = '02'
+            AND
+                dtl.is_need_manage = '1'
             OPTION 输入.formula_id <> ""
                 dtl.formula_id = 输入.formula_id
             ENDOPTION

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/rest/SparePartOutController.java

@@ -13,6 +13,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -76,6 +77,14 @@ public class SparePartOutController {
         return new ResponseEntity<>(sparePartOutService.getDisDtl(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/getStructIvt")
+    @Log("完成单据")
+    @ApiOperation("完成单据")
+    //@PreAuthorize("@el.check('materialtype:list')")
+    public ResponseEntity<Object> getStructIvt(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(sparePartOutService.getStructIvt(whereJson), HttpStatus.OK);
+    }
+
     @PostMapping("/getIvt")
     @Log("查询备件库存")
     @ApiOperation("查询备件库存")

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/SparePartOutService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.data.domain.Pageable;
 
+import java.util.HashMap;
 import java.util.Map;
 
 public interface SparePartOutService {
@@ -34,6 +35,8 @@ public interface SparePartOutService {
 
     JSONArray getDisDtl(JSONObject whereJson);
 
+    JSONArray getStructIvt(JSONObject whereJson);
+
     JSONArray getIvt(JSONObject whereJson);
 
     void divStruct(JSONObject whereJson);

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/service/impl/SparePartOutServiceImpl.java

@@ -206,6 +206,19 @@ public class SparePartOutServiceImpl implements SparePartOutService {
         return dtl_rows;
     }
 
+    @Override
+    public JSONArray getStructIvt(JSONObject whereJson) {
+        String search = (String) whereJson.get("search");
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "12");
+        map.put("material_id", whereJson.getString("material_id"));
+        if (StrUtil.isNotEmpty(search)){
+            map.put("search", search);
+        }
+        JSONArray dtl_rows = WQL.getWO("QEM_BI_SPAREPARTOUT").addParamMap(map).process().getResultJSONArray(0);
+        return dtl_rows;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void createCode(JSONObject form) {

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPARTOUT.wql

@@ -30,6 +30,7 @@
     输入.iostorinvdtl_id			        TYPEAS s_string
     输入.storagevehicle_code             TYPEAS s_string
     输入.iostorinv_id                    TYPEAS s_string
+    输入.material_id                     TYPEAS s_string
 
 
 [临时表]
@@ -464,6 +465,29 @@
             ENDQUERY
         ENDIF
 
+        IF 输入.flag = "12"
+            QUERY
+                SELECT
+                	sa.sect_name,
+                	sa.struct_name,
+                	ivt.sparepart_only_id,
+                	mb.material_code,
+                	mb.material_name,
+                	ivt.pcsn,
+                	ivt.ivt_qty,
+                	ivt.qty_unit_name,
+                	ivt.instorage_time
+                FROM
+                	em_bi_devicesparepartivt ivt
+                	LEFT JOIN st_ivt_structattr sa ON sa.struct_id = ivt.struct_id
+                	LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
+                WHERE
+                    ivt.material_id = 输入.material_id
+                ENDSELECT
+            ENDQUERY
+        ENDIF
+
+
 
 
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java

@@ -980,8 +980,10 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
         String batch_seq = jo.getString("pcsn");
         List<Entity> all = Db.use((DataSource) SpringContextHolder.getBean("dataSource1")).findAll(Entity.create("BATCH_SEQ").set("DR", "0").set("ITEM_ID", item_id).set("BATCH_SEQ", batch_seq));
         if (ObjectUtil.isNotEmpty(all)) {
+            log.info(item_id+","+batch_seq+"批次主键为："+all.get(0).getStr("BATCH_ID"));
             return all.get(0).getStr("BATCH_ID");
         } else {
+            log.info(item_id+","+batch_seq+"未查询到批次主键！");
             return null;
         }
     }