采购信息记录根据供应商、物料（原材料、半成品、产成品、辅料包材）和价格有效期至验证是否已完成质量检验

huigou-xt/src/main/webapp/system/opm/organization/Org.js

@@ -496,6 +496,8 @@ function initPersonDialog() {
 			return {bizCode: 'PersonPicture', bizId: id, flag: 'false', deleteOld: 'true', returnPath: 'true'};
 		}
 	});
+    $("#code").placeholder("工牌号");
+    $("#loginName").placeholder("工牌号");
     var isSapPerson = $("#isSapPerson").val();
     if (isSapPerson == "1"){
         sapMesShow();

topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java

@@ -111,16 +111,16 @@ public class ResourceSearchController {
         SapDialogQuery queryRequest = sdo.toObject(SapDialogQuery.class);
         queryRequest.setWerks(filterValue);
         List<Map<String,String>> mapList = sapMaterialApplication.getSapMaterial(queryRequest);
-        if (CollectionUtil.isNotEmpty(mapList)){
-            mapList = mapList
-                    .stream()
-                    .map(map->{
-                        String s = map.get("MATNR");
-                        map.put("MATNR",s.replaceAll("^(0+)", ""));
-                        return map;
-                    })
-                    .collect(Collectors.toList());
-        }
+//        if (CollectionUtil.isNotEmpty(mapList)){
+//            mapList = mapList
+//                    .stream()
+//                    .map(map->{
+//                        String s = map.get("MATNR");
+//                        map.put("MATNR",s.replaceAll("^(0+)", ""));
+//                        return map;
+//                    })
+//                    .collect(Collectors.toList());
+//        }
         if (CollectionUtil.isNotEmpty(mapList)){
             if (StringUtil.isNotBlank(filterValue)){//固定条件过滤，比如选了工厂后，只能读取改工厂下的物料组
                 mapList = mapList

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/application/impl/SapPurchaseInfoRecordApplicationImpl.java

@@ -46,8 +46,10 @@ public class SapPurchaseInfoRecordApplicationImpl extends FlowBroker implements
     private SapPurchaseInfoRecordItemApplication sapPurchaseInfoRecordItemApplication;
     @Resource
     private HttpClient httpClient;
+
+    @Transactional
     @Override
-    protected String saveBizAndApprovalData() {
+    public String saveBizAndApprovalData() {
         super.saveBizAndApprovalData();
         SapPurchaseInfoRecord sapPurchaseInfoRecord = getBizEntity(SapPurchaseInfoRecord.class);
         if (sapPurchaseInfoRecord.isNew()) {

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/application/impl/SapPurchaseInfoRecordItemApplicationImpl.java

@@ -6,11 +6,13 @@ import com.huigou.topsun.sap.purchaseInfoRecord.application.SapPurchaseInfoRecor
 import com.huigou.topsun.sap.purchaseInfoRecord.domain.SapPurchaseInfoRecordItem;
 import com.huigou.topsun.sap.purchaseInfoRecord.domain.query.SapPurchaseInfoRecordQueryRequest;
 import com.huigou.topsun.sap.purchaseInfoRecord.repository.SapPurchaseInfoRecordItemRepository;
+import com.huigou.topsun.sap.qualityInfoRecord.application.SapQualityInfoRecordItemApplication;
 import com.huigou.uasp.bmp.common.application.BaseApplication;
 import com.huigou.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,11 +26,18 @@ import java.util.Map;
 public class SapPurchaseInfoRecordItemApplicationImpl extends BaseApplication implements SapPurchaseInfoRecordItemApplication {
     @Autowired
     private SapPurchaseInfoRecordItemRepository sapPurchaseInfoRecordItemRepository;
+    @Autowired
+    private SapQualityInfoRecordItemApplication sapQualityInfoRecordItemApplication;
     @Override
     public void saveSapPurchaseInfoRecordItem(String sapPurchaseInfoRecordId, List<SapPurchaseInfoRecordItem> sapPurchaseInfoRecordItems) {
         sapPurchaseInfoRecordItems.forEach(sapPurchaseInfoRecordItem -> {
-            sapPurchaseInfoRecordItem.setSapPurchaseInfoRecordId(sapPurchaseInfoRecordId);
-            sapPurchaseInfoRecordItemRepository.save(sapPurchaseInfoRecordItem);
+            boolean checked = checkQualityInfo(sapPurchaseInfoRecordItem.getMatnr(), sapPurchaseInfoRecordItem.getLifnr(), sapPurchaseInfoRecordItem.getPrdat());
+            if (checked){
+                sapPurchaseInfoRecordItem.setSapPurchaseInfoRecordId(sapPurchaseInfoRecordId);
+                sapPurchaseInfoRecordItemRepository.save(sapPurchaseInfoRecordItem);
+            }else {
+                throw  new RuntimeException("供应商：'"+sapPurchaseInfoRecordItem.getLifnr()+"'和物料：'"+sapPurchaseInfoRecordItem.getMatnr()+"'未通过质检或价格有效至已超过合格有效期");
+            }
         });
     }
 
@@ -59,4 +68,8 @@ public class SapPurchaseInfoRecordItemApplicationImpl extends BaseApplication im
     public void save(SapPurchaseInfoRecordItem sapPurchaseInfoRecordItem) {
         sapPurchaseInfoRecordItemRepository.save(sapPurchaseInfoRecordItem);
     }
+
+    public boolean checkQualityInfo(String matnr, String lifnr, Date datbi){
+        return sapQualityInfoRecordItemApplication.checkQualityInfo(matnr,lifnr,datbi);
+    }
 }

topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/application/SapQualityInfoRecordItemApplication.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.qualityInfoRecord.application;
 import com.huigou.topsun.sap.qualityInfoRecord.domain.SapQualityInfoRecordItem;
 import com.huigou.topsun.sap.qualityInfoRecord.domain.query.SapQualityInfoRecordQueryRequest;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -22,4 +23,6 @@ public interface SapQualityInfoRecordItemApplication {
     List<SapQualityInfoRecordItem> findBySapQualityInfoRecordId(String sapQualityInfoRecordId);
 
     void save(SapQualityInfoRecordItem sapQualityInfoRecordItem);
+
+    boolean checkQualityInfo(String matnr, String lifnr, Date datbi);
 }

topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/application/impl/SapQualityInfoRecordItemApplicationImpl.java

@@ -12,6 +12,7 @@ import com.huigou.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -67,4 +68,16 @@ public class SapQualityInfoRecordItemApplicationImpl extends BaseApplication imp
     public void save(SapQualityInfoRecordItem sapQualityInfoRecordItem) {
         sapQualityInfoRecordItemRepository.save(sapQualityInfoRecordItem);
     }
+
+    @Override
+    public boolean checkQualityInfo(String matnr, String lifnr, Date datbi) {
+        QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "checkQualityInfo");
+        int num = this.sqlExecutorDao
+                .queryToInt(queryDescriptor.getSql(), matnr, lifnr, datbi);
+        boolean flag = false;
+        if ( num > 0){
+            flag = true;
+        }
+        return flag;
+    }
 }

topsun/src/main/resources/config/topsun/sap/sapQualityInfoRecord/sapQualityInfoRecordItem.xml

@@ -7,4 +7,20 @@
         <condition column="SAP_QUALITY_INFO_RECORD_ID" name="sapQualityInfoRecordId" type="java.lang.String" symbol="=" alias="t"/>
     </query>
 
+    <query name="checkQualityInfo" label="检查是否已执行质量检验" table="sap_quality_info_record_item">
+        <sql-query>
+            SELECT
+             COUNT(t.id) as num
+             FROM
+             sap_quality_info_record_item t
+             LEFT JOIN sap_quality_info_record s ON t.sap_quality_info_record_id = s.id
+             LEFT JOIN sap_non_prod_apply_dept d ON t.MATNR = d.MATNR
+             AND d.MTART IN ( 'ZYCL', 'ZBCP', 'ZZCP', 'ZFBL' )
+             WHERE s.STATUS = 3
+             AND t.MATNR = ?
+             AND t.LIEFERANT = ?
+             AND t.zvdatai >= ?
+        </sql-query>
+    </query>
+
 </query-mappings>
\ No newline at end of file