修改扫码单生成业务单逻辑

dev_no_inv
yewj 10 months ago
parent ead85598dc
commit 01028cc67f

@ -186,7 +186,7 @@ public class IoCodeTempController extends BaseController {
//前端扫码完整性校验 //前端扫码完整性校验
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/`enterCode") @PostMapping("warehouse/inout/enterCode")
public BaseResponse addEndterCode(@RequestBody AddEnterCodeRequest addEnterCodeRequest) { public BaseResponse addEndterCode(@RequestBody AddEnterCodeRequest addEnterCodeRequest) {
if (StrUtil.isEmpty(addEnterCodeRequest.getCode())) { if (StrUtil.isEmpty(addEnterCodeRequest.getCode())) {

@ -10,6 +10,7 @@ import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
import com.glxp.api.constant.WorkOperType; import com.glxp.api.constant.WorkOperType;
import com.glxp.api.dao.collect.IoCollectOrderCodeManMapper; import com.glxp.api.dao.collect.IoCollectOrderCodeManMapper;
import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.auth.SysWorkplace;
import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiEntity;
@ -25,6 +26,7 @@ import com.glxp.api.req.inout.AddTagCodeReqeust;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.collect.CollectOrderCodeManResponse; import com.glxp.api.res.collect.CollectOrderCodeManResponse;
import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.auth.SysWorkplaceService;
import com.glxp.api.service.basic.BasicCollectBustypeService; import com.glxp.api.service.basic.BasicCollectBustypeService;
import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.basic.SysWorkplaceDocumentService;
@ -97,6 +99,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
.eq(IoCollectOrderCodeMan::getUdiCode, code).last("limit 1")); .eq(IoCollectOrderCodeMan::getUdiCode, code).last("limit 1"));
} }
@Resource
InvWarehouseService invWarehouseService;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public IoCollectOrder prescribeTagCode(AddTagCodeReqeust addTagCodeReqeust) { public IoCollectOrder prescribeTagCode(AddTagCodeReqeust addTagCodeReqeust) {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
@ -142,9 +148,15 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
.workPlaceCode(workPlace.getWorkplaceId()) .workPlaceCode(workPlace.getWorkplaceId())
.createTime(new Date()) .createTime(new Date())
.createUser(userIds) .createUser(userIds)
.shipper(addTagCodeReqeust.getInvCode())
.updateTime(new Date()) .updateTime(new Date())
.tagStatus(1) .tagStatus(1)
.build(); .build();
if (StrUtil.isNotEmpty(addTagCodeReqeust.getInvCode())) {
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addTagCodeReqeust.getCode());
collectOrder.setShipperName(invWarehouseEntity.getName());
}
if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1) { if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1) {
collectOrder.setFromType("UDI系统"); collectOrder.setFromType("UDI系统");
} else { } else {

Loading…
Cancel
Save