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