补打，成品入库扫标识卡接口bug

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java

@@ -225,6 +225,15 @@ public class WmsProductPut extends BaseEntity {
     private String attribute1 ;
     private String attribute2;
     private String attribute3;
+    private String qcResult;
+
+    public String getQcResult() {
+        return qcResult;
+    }
+
+    public void setQcResult(String qcResult) {
+        this.qcResult = qcResult;
+    }
 
     public String getAttribute1() {
         return attribute1;

op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java

@@ -86,6 +86,8 @@ public interface WmsProductPutMapper {
 
     WmsProductPut selectProOrderWorkorderBatchPalletAtter(ProOrderWorkorder proOrderWorkorder);
 
+//    String selectProOrderWorkorder(WmsProductPut wmsProductPut1);
+
 
 //    String selectWmsProductPutNum(wmsReportWork wmsReportWork);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -1174,10 +1174,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     }
 
     @Override
+    @DS("#header.poolName")
     public String getIdCardListDA(OdsProcureOrder odsProcureOrder) {
         //会有个id和补打的数量
         OdsProcureOrder order=odsProcureOrderMapper.selectOdsProcureOrderByID(odsProcureOrder.getID());
         List<OdsProcureOrder> dtos0=  odsProcureOrderMapper.getIdCardList(order);
+        if(dtos0==null){
+            return "这个采购单未打印过";
+        }
         int tme=   dtos0.size();
         OdsProcureOrder order1=dtos0.get(tme-1);
         order1.setPlanNumber(odsProcureOrder.getBuNumber());
@@ -1189,13 +1193,20 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         cardNum += 1;  // 在这里进行值相加
         order1.setCardNum(String.valueOf(cardNum));
         List<OdsProcureOrder> dtos = new ArrayList<>();
-
+        order1.setID(null);
-        return null;
+        dtos.add(order1);
+        odsProcureOrderMapper.addBatchPallet(dtos);
+        String  resylt=  dayin(dtos);
+//        resylt
+//        order1
+        return resylt;
     }
 
     public String dayin(  List<OdsProcureOrder> orderList) {
         // 定义请求的URL地址
         String url = dayinUrl1;
+        // 打印输出url的值
+        System.out.println(url);
         // 创建OkHttpClient实例，用于发送HTTP请求
         OkHttpClient client = new OkHttpClient();
 

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java

@@ -86,7 +86,13 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
     @Override
     @DS("#header.poolName")
     public List<WmsProductPut> selectWmsProductPutList(WmsProductPut wmsProductPut) {
-        return wmsProductPutMapper.selectWmsProductPutList(wmsProductPut);
+        List<WmsProductPut>     wmsProductPutList= wmsProductPutMapper.selectWmsProductPutList(wmsProductPut);
+//        for (WmsProductPut  wmsProductPut1:
+//             wmsProductPutList) {
+//           String   qcResult=     wmsProductPutMapper.selectProOrderWorkorder(wmsProductPut1);
+//            wmsProductPut1.setQcResult(qcResult);
+//        }
+        return wmsProductPutList;
     }
 
     /**
@@ -526,7 +532,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 WmsProductPut wmsProductPut2 = new WmsProductPut();
                 wmsProductPut2.setId(mesReportWork.getId());
                 wmsProductPut2.setSapMessage(msg);
-                if (code == 200) {//过账成功
+                if (code == 200) {
+                    //过账成功
                     String tem = (String) result.getData();
                     wmsProductPut2.setSapProof(tem);
                     wmsProductPut2.setSapStatus("1");
@@ -1117,7 +1124,6 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
 //        whCode
 //        waCode
 //        factoryCode
-
         DynamicDataSourceContextHolder.push("ds_" + wmsProductPut.getFactoryCode());
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
         Date date = new Date();
@@ -1141,7 +1147,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         wmsProductPutk.setUnitOfMeasure(wmsProductPut1.getUnitOfMeasure());
         wmsProductPutk.setBatchNumber(wmsProductPut1.getBatchNumber());//
        List<WmsProductPut> wmsProductPutLists=   wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk);
-       if (wmsProductPutLists.size()>0){//有
+       if (wmsProductPutLists.size()>0){
+           //有
            WmsProductPut    wmsProductPut2=    wmsProductPutLists.get(0);
            BigDecimal planQuantity=    wmsProductPut2.getPlanQuantity();
            BigDecimal putQuantity=     wmsProductPut2.getPutQuantity();
@@ -1205,6 +1212,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsFpStorageNewsSn.setCreateTime(new Date());
             wmsFpStorageNewsSn.setActiveFlag("1");
             wmsFpStorageNewsSn.setUserDefined3(wmsProductPut1.getUnitOfMeasure());
+            wmsFpStorageNewsSn.setGmtCreate(new Date());
             wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn);
 //			wms_fp_storage_news
             WmsFpStorageNews wmsFpStorageNews = new WmsFpStorageNews();

op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml

@@ -460,4 +460,8 @@
             pro_order_workorder_batch_pallet.pallet_code= #{attr1}
 
     </select>
+<!--    <select id="selectProOrderWorkorder"    >-->
+
+
+<!--    </select>-->
 </mapper>

op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml

@@ -223,6 +223,7 @@
         FROM
             wms_product_production_records
         <where>
+            <if test="userDefined1 != null  and userDefined1 != ''">and user_defined1 = #{userDefined1}</if>
             <if test="id != null  and id != ''">and id = #{id}</if>
             <if test="productOrder != null  and productOrder != ''">and product_order     like concat('%', #{productOrder},
                 '%')</if>