Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java

@@ -182,15 +182,22 @@ public class InvInnerOrderPrintController {
 
 
         }
+        String orderId="";
         for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) {
             InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity();
             innerOrderPrintEntity.setStatus(1);
             innerOrderPrintEntity.setId(InnerOrderPrintResponse.getId());
             invInnerOrderPrintService.updateOrder(innerOrderPrintEntity);
+            orderId=InnerOrderPrintResponse.getId()+"";
         }
+
+        //查询订单id
+        InvInnerOrderPrintEntity innerOrderPrintEntity=invInnerOrderPrintService.selectById(orderId);
+
         IoOrderEntity ioOrderEntity=new IoOrderEntity();
         ioOrderEntity.setInCodeStatus(1);
-        ioOrderService.update(ioOrderEntity);
+        ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk());
+        ioOrderService.updateByBillNo(ioOrderEntity);
         return null;
 
     }

src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java

@@ -33,6 +33,8 @@ public class InnerOrderPrintResponse {
     private String sOrderId;
     private String sDetailId;
     private Date updateTime;
+    private Date createTime;
+    private Integer status;
 
 
     private Integer count;

src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml

@@ -43,6 +43,9 @@
             resultType="com.glxp.api.res.inv.InnerOrderPrintResponse">
         SELECT inv_inner_order_print.id,
                inv_inner_order_print.udiCode,
+               inv_inner_order_print.createTime,
+               inv_inner_order_print.status,
+               inv_inner_order_print.updateTime,
                basic_products.nameCode,
                inv_inner_order_print.batchNo,
                inv_inner_order_print.productDate,
@@ -52,6 +55,7 @@
                basic_products.ylqxzcrbarmc,
                basic_products.zczbhhzbapzbh,
                basic_products.ggxh
+
         FROM inv_inner_order_print
                      LEFT JOIN basic_udirel ON inv_inner_order_print.productId = basic_udirel.id
                      INNER JOIN basic_products ON basic_products.uuid = basic_udirel.uuid