批量扫码

src/main/java/com/glxp/api/constant/ConstantType.java

@@ -10,4 +10,7 @@ public interface ConstantType {
     String SPLIT_RETURN = "SC72249388338364";  //拆零退货
     String SPLIT_OUT = "SC72197936495755";  //拆零出库
 
+
+    String SPLIT_CORP = "72198012799726";
+
 }

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

@@ -407,6 +407,16 @@ public class IoCodeTempController extends BaseController {
             if (StrUtil.isNotEmpty(addOrderRequest.getSerialNo())) {
                 udiEntity.setSerialNo(addOrderRequest.getSerialNo());
             }
+
+            AuthAdmin authAdmin = getUser();
+            addOrderRequest.setInvCode(authAdmin.getLocInvCode());
+            if (IntUtil.value(addOrderCodeRequest.getInoutType()) == 2) {
+                addOrderRequest.setAction(ConstantType.SPLIT_RETURN);
+            } else {
+                addOrderRequest.setAction(ConstantType.SPLIT_OUT);
+            }
+            addOrderRequest.setFromCorp(ConstantType.SPLIT_CORP);
+
             BaseResponse baseResponse = null;
             if (IntUtil.value(udiEntity.getProductType()) == 2) {
                 baseResponse = adddGrugOrder(addOrderRequest, udiEntity, code);

src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java

@@ -38,4 +38,10 @@ public class AddOrderCodeRequest {
     @NotNull(message = "上货方式不能为空")
     private Integer inoutType;
 
+
+    /**
+     * 单据号
+     */
+    private String billNo;
+
 }

src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java

@@ -17,17 +17,39 @@ public class AddTagCodeReqeust {
      * udi码/药品追溯码
      */
     private String code;
-
+    /**
-
+     * 扫码列表
+     */
     private List<String> codeList;
 
+    /**
+     * 单据号
+     */
     private String billNo;
 
+    /**
+     * 工位编码
+     */
     private Long workPlaceCode;
+    /**
+     * 往来单位
+     */
     private String fromCorp;
+    /**
+     * 往来单位名称
+     */
+    private String fromCorpName;
+    /**
+     * 仓库号码
+     */
     private String invCode;
+    /**
+     * 是否确认插入
+     */
     private Boolean insert;
-
+    /**
+     * 业务类型
+     */
     private String busType;
 
 

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -141,6 +141,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         .billNo(orderNo)
                         .busType(sysWorkplaceDocumentEntity.getDocumentTypeCode())
                         .fromCorp(addTagCodeReqeust.getFromCorp())
+                        .fromCorpName(addTagCodeReqeust.getFromCorpName())
                         .billTime(new Date())
                         .workPlaceCode(workPlace.getWorkplaceId())
                         .createTime(new Date())