内部码打印代码提交

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -415,7 +415,7 @@ public class IoOrderController extends BaseController {
         } else if (stockOrderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
 
             //1.校验是否为委托验收人
-            if (!stockOrderEntity.isEntrustEnd()) {
+            if (!stockOrderEntity.getEntrustEnd()==true) {
                 BasicEntrustRecRequest basicEntrustRecRequest = new BasicEntrustRecRequest();
                 basicEntrustRecRequest.setAction(stockOrderEntity.getAction());
                 basicEntrustRecRequest.setEntrustUser(userId);

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

@@ -11,12 +11,15 @@ import com.glxp.api.constant.BusinessType;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.entity.inv.InnerOrderDetailEntity;
 import com.glxp.api.entity.inv.InnerOrderEntity;
+import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.req.inv.InnerOrderDetailRequest;
 import com.glxp.api.req.inv.InnerOrderRequest;
 import com.glxp.api.req.inv.PostInnerOrderRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inv.innerOrderDetailResponse;
 import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inv.InnerOrderDetailService;
 import com.glxp.api.service.inv.InnerOrderService;
 import com.glxp.api.util.GennerOrderUtils;
@@ -52,6 +55,8 @@ public class InnerOrderController {
     CustomerService customerService;
     @Resource
     GennerOrderUtils gennerOrderUtils;
+    @Resource
+    IoOrderDetailBizService ioOrderDetailBizService;
 
     /**
      * 新增内部码打印单
@@ -77,7 +82,7 @@ public class InnerOrderController {
         } else {
             innerOrderService.update(innerOrderEntity);
         }
-        return ResultVOUtils.success(innerOrderEntity.getId());
+        return ResultVOUtils.success(innerOrderEntity);
     }
 
 
@@ -171,6 +176,32 @@ public class InnerOrderController {
         return ResultVOUtils.success("");
     }
 
+    /**
+     * 新增内部码打印单
+     */
+    @RepeatSubmit()
+    @PostMapping("/orderDetailAdd")
+    @Log(title = "内部码", businessType = BusinessType.INSERT)
+    public BaseResponse orderDetailAdd(@RequestBody InnerOrderDetailRequest innerOrderDetailRequest) {
+        InnerOrderDetailEntity innerOrderDetailEntity=new InnerOrderDetailEntity();
+
+        //查询业务单
+        FilterOrderDetailBizRequest filterOrderDetailBizRequest=new FilterOrderDetailBizRequest();
+        filterOrderDetailBizRequest.setOrderIdFk(innerOrderDetailRequest.getBillNo());
+        List<IoOrderDetailBizResponse> ioOrderDetailBizResponseList = ioOrderDetailBizService.filterList(filterOrderDetailBizRequest);
+        for (IoOrderDetailBizResponse ioOrderDetailBizResponse : ioOrderDetailBizResponseList) {
+            innerOrderDetailEntity.setOrderIdFk(innerOrderDetailRequest.getOrderIdFk());
+            innerOrderDetailEntity.setProductId(ioOrderDetailBizResponse.getBindRlFk()+"");
+            innerOrderDetailEntity.setProductName(ioOrderDetailBizResponse.getCoName());
+            innerOrderDetailEntity.setProductDate(ioOrderDetailBizResponse.getProductDate());
+            innerOrderDetailEntity.setExpireDate(ioOrderDetailBizResponse.getExpireDate());
+            innerOrderDetailEntity.setBatchNo(ioOrderDetailBizResponse.getBatchNo());
+            innerOrderDetailEntity.setCount(ioOrderDetailBizResponse.getCount());
+            innerOrderDetailService.insert(innerOrderDetailEntity);
+        }
+        return ResultVOUtils.success("");
+    }
+
     /**
      * 修改内部码打印单
      */

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

@@ -8,6 +8,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.entity.inv.InnerOrderEntity;
 import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
@@ -18,6 +19,7 @@ import com.glxp.api.req.inv.*;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.inv.InnerOrderPrintResponse;
 import com.glxp.api.service.inout.IoOrderService;
+import com.glxp.api.service.inv.InnerOrderService;
 import com.glxp.api.service.inv.InvInnerOrderPdfTempService;
 import com.glxp.api.service.inv.InvInnerOrderPrintService;
 import com.glxp.api.service.inv.JaspaperService;
@@ -58,6 +60,8 @@ public class InvInnerOrderPrintController {
     private InvInnerOrderPdfTempService innerOrderPdfTempService;
     @Resource
     private IoOrderService ioOrderService;
+    @Resource
+    private InnerOrderService innerOrderService;
 
 
     @GetMapping("/udiwms/innerOrderPrint/filter")
@@ -194,6 +198,17 @@ public class InvInnerOrderPrintController {
         //查询订单id
         InvInnerOrderPrintEntity innerOrderPrintEntity=invInnerOrderPrintService.selectById(orderId);
 
+
+        //更新内部码状态
+
+        InnerOrderEntity innerOrderEntity=innerOrderService.findByRecordKey(innerOrderPrintEntity.getOrderIdFk());
+        if(innerOrderEntity!=null){
+            innerOrderEntity.setGenStatus(2);
+            innerOrderEntity.setId(innerOrderEntity.getId());
+            innerOrderService.update(innerOrderEntity);
+        }
+
+
         IoOrderEntity ioOrderEntity=new IoOrderEntity();
         ioOrderEntity.setInCodeStatus(1);
         ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk());

src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java

@@ -194,7 +194,7 @@ public class IoOrderEntity {
     private String preInBillNo;
 
     @TableField(value = "entrustEnd")
-    private boolean entrustEnd;
+    private Boolean entrustEnd;
 
 
     /**
@@ -231,7 +231,7 @@ public class IoOrderEntity {
     @TableField(value = "processStatus")
     private Integer processStatus;     //退货单据处理状态
     @TableField(value = "inCodeStatus")
-    private int inCodeStatus;     //内部码生成状态
+    private Integer inCodeStatus;     //内部码生成状态
 
     @TableField(value = "relKey")
     private String relKey;      //关联单据唯一键

src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java

@@ -8,5 +8,6 @@ public class InnerOrderDetailRequest extends ListPageRequest {
 
     private String orderIdFk;
     private String productId;
+    private String billNo;
 
 }