物料标识卡对接打印机接口

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

@@ -54,6 +54,11 @@ public class OdsProcureOrderController extends BaseController {
     public AjaxResult getIdCardList(@RequestBody OdsProcureOrder odsProcureOrder) {
         return success(odsProcureOrderService.getIdCardList(odsProcureOrder));
     }
+    /**获补打标识卡**/
+    @PostMapping("/getIdCardListDA")
+    public AjaxResult getIdCardListDA(@RequestBody OdsProcureOrder odsProcureOrder) {
+        return success(odsProcureOrderService.getIdCardListDA(odsProcureOrder));
+    }
     /**
      * 导出包材采购单列表
      */

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

@@ -185,6 +185,16 @@ public class OdsProcureOrder extends BaseEntity {
     @Excel(name = "计划数量")
     private BigDecimal planNumber;
 
+    private BigDecimal buNumber;
+
+    public BigDecimal getBuNumber() {
+        return buNumber;
+    }
+
+    public void setBuNumber(BigDecimal buNumber) {
+        this.buNumber = buNumber;
+    }
+
     /**
      * 单位
      */

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

@@ -113,4 +113,6 @@ public interface IOdsProcureOrderService {
     void OutboundPostingSAPfc(List<OdsProcureOutOrder> orderList);
 
     String getIdCardList(OdsProcureOrder odsProcureOrder);
+
+    String getIdCardListDA(OdsProcureOrder odsProcureOrder);
 }

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

@@ -40,6 +40,7 @@ import com.op.common.core.utils.uuid.IdUtils;
 import com.op.wms.domain.*;
 import com.op.wms.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.op.wms.service.IOdsProcureOrderService;
 import org.springframework.util.CollectionUtils;
@@ -81,7 +82,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     private RemoteOpenService remoteOpenService;
     @Autowired
     private BaseProductAttachedMapper baseProductAttachedMapper;
-
+    @Value("${dayin.url1}")
+    private String dayinUrl1;
     /**
      * 查询包材采购单
      *
@@ -778,11 +780,15 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         R result2 =   remoteSapService.temporarilyCollected(mapList);
         int code = result2.getCode();
         if (code == 200){//成功
+            Map map = new HashMap();
+            map = (Map) result2.getData();
+            String MATERIALDOCUMENT = (String) map.get("MATERIALDOCUMENT");
+            String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR");
             order.setSapTempInfor(result2.getMsg());
             WmsRawOrderIn   wmsRawOrderIn=new WmsRawOrderIn();
             wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID());
             wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode());
-            wmsRawOrderIn.setDnNo(order.getReceiptNoCode());
+            wmsRawOrderIn.setDnNo(odsProcureOrder.getReceiptNoCode());
             wmsRawOrderIn.setPoNo(order.getProcureCode());
             wmsRawOrderIn.setPoLine(order.getUserDefined3());
             wmsRawOrderIn.setMaterialCode(order.getMaterialCode());
@@ -793,7 +799,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             wmsRawOrderIn.setOrderStatus("0");//暂收
             wmsRawOrderIn.setActiveFlag("1");
             wmsRawOrderIn.setSupplyCode(order.getSupplierCode());
-            wmsRawOrderIn.setUserDefined1(result2.getMsg());
+            //wmsRawOrderIn.setUserDefined1();
+            wmsRawOrderIn.setAccountingStatus("2");
+            wmsRawOrderIn.setUserDefined1(MATERIALDOCUMENT);//物料凭证编号
+            wmsRawOrderIn.setUserDefined2(MATDOCUMENTYEAR);
+            wmsRawOrderIn.setAccountingMessage(result2.getMsg());
             wmsRawOrderIn.setSapFactoryCode(odsProcureOrder.getFactoryCode());
             wmsRawOrderIn.setCreateBy(odsProcureOrder.getCreateBy());
             wmsRawOrderInMapper.insertWmsRawOrderIn(wmsRawOrderIn);
@@ -1162,9 +1172,29 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         return msg;
     }
 
+    @Override
+    public String getIdCardListDA(OdsProcureOrder odsProcureOrder) {
+        //会有个id和补打的数量
+        OdsProcureOrder order=odsProcureOrderMapper.selectOdsProcureOrderByID(odsProcureOrder.getID());
+        List<OdsProcureOrder> dtos0=  odsProcureOrderMapper.getIdCardList(order);
+        int tme=   dtos0.size();
+        OdsProcureOrder order1=dtos0.get(tme-1);
+        order1.setPlanNumber(odsProcureOrder.getBuNumber());
+        // 获取当前的卡号数量，假设它是一个字符串类型
+        String cardNumStr = order1.getCardNum();
+        // 将字符串转换为整数
+        int cardNum = Integer.parseInt(cardNumStr);
+        // 进行加法运算
+        cardNum += 1;  // 在这里进行值相加
+        order1.setCardNum(String.valueOf(cardNum));
+        List<OdsProcureOrder> dtos = new ArrayList<>();
+
+        return null;
+    }
+
     public String dayin(  List<OdsProcureOrder> orderList) {
         // 定义请求的URL地址
-        String url = "http://172.18.80.215:8022/printService/printServiceTest";
+        String url = dayinUrl1;
         // 创建OkHttpClient实例，用于发送HTTP请求
         OkHttpClient client = new OkHttpClient();
 

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

@@ -288,6 +288,7 @@
         FROM
             ods_procure_order_card
         where Procure_Code=#{procureCode}   and  User_Defined3= #{userDefined3}  and User_Defined8= #{userDefined8}  and User_Defined11= #{userDefined11}
+        ORDER BY	card_num
     </select>
     <!-- 定义一个插入操作，ID为addBatchPallet，参数类型为List<OdsProcureOrder> -->
     <insert id="addBatchPallet" parameterType="java.util.List">