wms采购到货（SRM）到货登记界面改进，重点加上“整张送货单一键报检”，不用选择和修改数字 加标识卡的打印顺序，如：7张标识卡的话，就是7-1、7-2、7-3这样

op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInController.java

@@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.op.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;

op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInDetailController.java

@@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.microsoft.windowsazure.exception.ServiceException;
 import com.op.common.security.annotation.RequiresPermissions;
-import org.springframework.security.access.prepost.PreAuthorize;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java

@@ -138,6 +138,13 @@ public class WmsToWCSmissionController {
         String result = odsProcureOrderService.ArrivalRegistration(odsProcureOrder);
         return success(result);
     }
+    @PostMapping("/ArrivalRegistrationSH")
+    public AjaxResult ArrivalRegistrationSH(@RequestBody OdsProcureOrder odsProcureOrder) {
+//        odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder);
+//        return success();
+        String result = odsProcureOrderService.ArrivalRegistrationSH(odsProcureOrder);
+        return success(result);
+    }
     /**
      * 手持 －查询到货登记记录--已登记数量
      */

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

@@ -90,21 +90,23 @@ public interface OdsProcureOrderMapper {
      */
     public List<OdsProcureOrder> selectOdsProcureOrderList1(OdsProcureOrder odsProcureOrder);
 
-    OdsProcureOrder selectOdsProcureOrderCardByUserDefined1(OdsProcureOrder odsProcureOrder);
+    public  OdsProcureOrder selectOdsProcureOrderCardByUserDefined1(OdsProcureOrder odsProcureOrder);
 
 
-    List<OdsProcureOrder> getIdCardByIdList(@Param("storageId")String storageId);
+    public  List<OdsProcureOrder> getIdCardByIdList(@Param("storageId")String storageId);
 
-    OdsProcureOrder selectOdsProcureOrderCardTL(OdsProcureOrder odsProcureOrder);
+    public   OdsProcureOrder selectOdsProcureOrderCardTL(OdsProcureOrder odsProcureOrder);
 
-    OdsProcureOrder selectWMSOdsProcureReturnOrderByID(String id);
+    public   OdsProcureOrder selectWMSOdsProcureReturnOrderByID(String id);
 
-    List<OdsProcureOrder> getIdCardListTH(OdsProcureOrder order);
+    public  List<OdsProcureOrder> getIdCardListTH(OdsProcureOrder order);
 
 
-    void deleteBatchPallet(@Param("list")List<OdsProcureOrder> dtos0);
+    public  void deleteBatchPallet(@Param("list")List<OdsProcureOrder> dtos0);
 
-    List<OdsProcureOrder> getIdCardListByU1(OdsProcureOrder order);
+    public   List<OdsProcureOrder> getIdCardListByU1(OdsProcureOrder order);
 
-    String selectOdsProcureOrderUserDefined7New(@Param("formattedTEM")String formattedDate);
+    public   String selectOdsProcureOrderUserDefined7New(@Param("formattedTEM")String formattedDate);
+
+    public   List<OdsProcureOrder> selectOdsProcureOrderListSH(OdsProcureOrder order2);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java

@@ -141,4 +141,6 @@ public interface IOdsProcureOrderService {
     String NewConMaterialOutSCNew(List<OdsProcureOutOrder> orderList, List<OdsProcureOutOrder> gzList);
 
     List<OdsProcureOutOrder> CKlist(OdsProcureOutOrder odsProcureOutOrder);
+
+    String ArrivalRegistrationSH(OdsProcureOrder odsProcureOrder);
 }

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

@@ -1179,6 +1179,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 }
 
             if(!CollectionUtils.isEmpty(dtos)){
+              int   tem=  dtos.size();
+                int    ken=1;
+                for (OdsProcureOrder    order1:
+                 dtos) {
+                    order1.setUserDefined9(tem+"-"+ken);
+                    System.out.print(tem+"-"+ken);
+                    ken++;
+                }
                 odsProcureOrderMapper.addBatchPallet(dtos);
             }
         }else{
@@ -1225,6 +1233,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             }
 
             if(!CollectionUtils.isEmpty(dtos)){
+                int   tem=  dtos.size();
+                int    ken=1;
+                for (OdsProcureOrder    order1:
+                        dtos) {
+                    order1.setUserDefined9(tem+"-"+ken);
+                    System.out.print(tem+"-"+ken);
+                    ken++;
+                }
                 odsProcureOrderMapper.addBatchPallet(dtos);
             }
         }
@@ -1262,6 +1278,16 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         String  dateString = order1.getUserDefined11().replace("-", "");
         order1.setUserDefined1(order1.getProcureCode()+"-"+order1.getUserDefined3()+"-"+order1.getUserDefined8()+"-"+dateString+"-"+order1.getUserDefined4()+"-"+order1.getCardNum());//采购单+行项目+类型+日期+板次
         order1.setUserDefined10("0");
+       if ( order1.getUserDefined9()!=null){
+           String   userDefined9=    order1.getUserDefined9();
+           String[]   userDefined9s=   userDefined9.split("-");
+           String firstValue = userDefined9s[0];
+           String secondValueStr = userDefined9s[1]; // 获取第二个值的字符串
+           int secondValue = Integer.parseInt(secondValueStr); // 转换为整数
+           secondValue += 1; // 加1
+           order1.setUserDefined9(firstValue+secondValue);
+       }
+
         dtos.add(order1);
         odsProcureOrderMapper.addBatchPallet(dtos);
         for (OdsProcureOrder    odsProcureOrder1:
@@ -2506,6 +2532,49 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         return orderList;
     }
 
+    @Override
+    public String ArrivalRegistrationSH(OdsProcureOrder odsProcureOrder) {
+        String  result="操作成功";
+        DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
+        OdsProcureOrder order2=new OdsProcureOrder();
+        order2.setUserDefined5(odsProcureOrder.getUserDefined5());
+        List<OdsProcureOrder>   orderList=   odsProcureOrderMapper.selectOdsProcureOrderListSH(order2);
+        for ( OdsProcureOrder    odsProcureOrder1 :
+        orderList) {
+            OdsProcureOrder order=new   OdsProcureOrder();
+            order.setProcureCode(odsProcureOrder1.getProcureCode());
+            order.setActive("1");
+            OdsProcureOrder   order1=   odsProcureOrderMapper.selectOdsProcureOrderByID(odsProcureOrder1.getID());
+
+            //查询这次收货信息----生成质检任务-------      //插入检验集计划
+            QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO = new QcCheckTaskIncomeDTO();
+            qcCheckTaskIncomeDTO.setCheckLoc("mjtest");
+            qcCheckTaskIncomeDTO.setCheckType("checkTypeLL");
+            qcCheckTaskIncomeDTO.setSupplierCode(order1.getSupplierCode());
+            String name = odsProcureOrderMapper.selectBaseSupplier(order1);
+            qcCheckTaskIncomeDTO.setSupplierName(name);
+            qcCheckTaskIncomeDTO.setOrderType("8040");//包材固定码
+            qcCheckTaskIncomeDTO.setUnit(order1.getUnit());
+            qcCheckTaskIncomeDTO.setFactoryCode(odsProcureOrder.getFactoryCode());
+            qcCheckTaskIncomeDTO.setQuality(odsProcureOrder1.getPlanNumber());//操作数量
+            qcCheckTaskIncomeDTO.setMaterialCode(order1.getMaterialCode());
+            qcCheckTaskIncomeDTO.setMaterialName(order1.getMaterialDesc());
+            // qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2());
+            qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode());
+            qcCheckTaskIncomeDTO.setIncomeTime(new Date());
+            R   ruslt=   remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);
+//      成功后修改--
+            if (ruslt.getCode()==200){//成功
+                odsProcureOrder1.setCzNumber(odsProcureOrder1.getPlanNumber());
+                odsProcureOrder1.setLastUpdateBy(odsProcureOrder.getLastUpdateBy());
+                odsProcureOrderMapper.updateOdsProcureOrderAddOperationNumber(odsProcureOrder1);
+            }else {
+                result="操作失败:"+ruslt.getMsg();
+            }
+        }
+        return result;
+    }
+
 //    @Override
 //    public String addReturnSC(List<OdsProcureOrder> orderList) {
 //        String factoryCode = orderList.get(0).getFactoryCode();

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

@@ -652,6 +652,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         String  result="入库成功";
         //先判断这个订单是否存在//如果存在--就修改订单。-如果不存在就添加上，
         DynamicDataSourceContextHolder.push("ds_" + wmsOdsWhiteEmbryoIn.getSiteCode());
+      String    userDefined1=  wmsOdsWhiteEmbryoIn.getUserDefined1();
         WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn1=   wmsOdsWhiteEmbryoInMapper.selectWmsOdsWhiteEmbryoInByOrderCodeAndUserDefined1(wmsOdsWhiteEmbryoIn);
         if (wmsOdsWhiteEmbryoIn1==null){
             //原来不存在
@@ -688,7 +689,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsOdsEmStorageNewsSn.setMaterialCode(wmsOdsWhiteEmbryoIn.getMaterialCode());
             wmsOdsEmStorageNewsSn.setMaterialDesc(wmsOdsWhiteEmbryoIn.getMaterialDesc());
             wmsOdsEmStorageNewsSn.setSn(wmsWhiteBilletInfor.getSn());
-            wmsOdsEmStorageNewsSn.setBarCode(wmsWhiteBilletInfor.getBatchCode());
+            wmsOdsEmStorageNewsSn.setBarCode(userDefined1);
             wmsOdsEmStorageNewsSn.setAmount(new BigDecimal(wmsWhiteBilletInfor.getBatchQuantity()));
             wmsOdsEmStorageNewsSn.setCreateBy(wmsOdsWhiteEmbryoIn.getCreateBy());
             wmsOdsEmStorageNewsSn.setGmtCreate(new Date());

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

@@ -803,5 +803,12 @@
         WHERE
             LEFT(User_Defined7, 6) =  #{formattedTEM}
     </select>
+
+    <select id="selectOdsProcureOrderListSH"   parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
+        <include refid="selectOdsProcureOrderVo"/>
+        where   User_Defined5= #{userDefined5}
+        AND	(Plan_Number-COALESCE ( Operation_Number, 0 ))>0
+        order by Create_Date desc
+    </select>
 </mapper>