diff --git a/src/main/java/com/glxp/api/constant/ConstantType.java b/src/main/java/com/glxp/api/constant/ConstantType.java index cc53b64c8..abfb05ee2 100644 --- a/src/main/java/com/glxp/api/constant/ConstantType.java +++ b/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"; + } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index dbdb30b54..a4b9a81b5 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/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); diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java index 515b71c91..716e276eb 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java +++ b/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; + } diff --git a/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java b/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java index 37884fb09..4b8cebf9f 100644 --- a/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java +++ b/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java @@ -17,17 +17,39 @@ public class AddTagCodeReqeust { * udi码/药品追溯码 */ private String code; - - + /** + * 扫码列表 + */ private List codeList; + /** + * 单据号 + */ private String billNo; + /** + * 工位编码 + */ private Long workPlaceCode; + /** + * 往来单位 + */ private String fromCorp; + /** + * 往来单位名称 + */ + private String fromCorpName; + /** + * 仓库号码 + */ private String invCode; + /** + * 是否确认插入 + */ private Boolean insert; - + /** + * 业务类型 + */ private String busType; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 5a111d068..ee862f409 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -141,6 +141,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl