UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

器械自动赋码问题

Browse Source
dev_2.5_optimize
yewj 4 months ago
parent 5d6bb97dea
commit e7e7a57744
3 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File

9
src/main/java/com/glxp/api/controller/inout/IoSplitController.java
Unescape Escape View File

@ -138,19 +138,16 @@ public class IoSplitController extends BaseController {
if (collectOrder == null) {
return ResultVOUtils.error(500, "未找到单据");
}
// if (collectOrder.getTagStatus() == 2) {
// return ResultVOUtils.error(501, "当前单据正在处理中,请重新选择单据");
// }
SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) {
collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode());
//todo 后面改
if(sysWorkplaceDocumentEntity.getProductType() == 1){
}else {
if (sysWorkplaceDocumentEntity.getProductType() == 1) {
splitCodeService.preQxAutoTagCode(collectOrder, null);
} else {
splitCodeService.preAutoTagCode(collectOrder, null);
}

6
src/main/java/com/glxp/api/entity/collect/IoCollectOrderCodeAuto.java
Unescape Escape View File

@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import io.swagger.models.auth.In;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -62,6 +63,11 @@ public class IoCollectOrderCodeAuto implements Serializable {
private Long relId;
private String nameCode;
private Integer count;
private Integer reCount;
/**
* 批次号
*/

58
src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
Unescape Escape View File

@ -334,7 +334,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
}
//构造单据数据
IoOrderEntity orderEntity = new IoOrderEntity();
bussinessTypeEntity = bussinessTypeService.findByAction(sysWorkplaceDocumentEntity.getDocumentTypeCode());
bussinessTypeEntity = bussinessTypeService.findByAction(sysWorkplaceDocumentEntity.getUploadDocumentTypeCode());
orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
orderEntity.setAction(bussinessTypeEntity.getAction());
orderEntity.setPreInBillNo(collectOrder.getPreInBillNo());
@ -342,11 +342,12 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
if (IntUtil.value(sysWorkplaceDocumentEntity.getCorpType()) == 2) {
orderEntity.setInvCode(invWarehouseEntity.getCode());
orderEntity.setFromCorp(collectOrder.getFromCorp());
if (invWarehouseEntity != null) orderEntity.setDeptCode(invWarehouseEntity.getParentId());
} else {
orderEntity.setInvCode(invWarehouseEntity.getCode());
orderEntity.setFromCorp(collectOrder.getShipper());
if (invWarehouseEntity != null) orderEntity.setDeptCode(invWarehouseEntity.getParentId());
orderEntity.setFromCorp(addInoutService.updateCorp(bussinessTypeEntity, collectOrder.getFromCorp(), collectOrder.getFromCorp()));
}
if (invWarehouseEntity != null) {
orderEntity.setDeptCode(invWarehouseEntity.getParentId());
}
orderEntity.setCorpOrderId(CustomUtil.getId() + "x");
orderEntity.setExportStatus(0);
@ -366,6 +367,11 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodes) {
lossCodesList.add(buildCodeEntity(collectOrderCodeMan, orderEntity));
}
List<IoCollectOrderCodeAuto> collectOrderCodeAutos = collectOrderCodeAutoService.listByBillNo(collectOrder.getBillNo(), null);
for (IoCollectOrderCodeAuto collectOrderCodeAuto : collectOrderCodeAutos) {
lossCodesList.add(buildAutoCodeEntity(collectOrderCodeAuto, orderEntity));
}
/**
* 如果单据类型为供应商的话，则进行供应商产品绑定
*/
@ -389,19 +395,16 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
public void updateSpmsOrder(String billNo, AuthAdmin authAdmin) {
{
IoOrderEntity orderEntity = orderService.findByBillNo(billNo);
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
reviewFinishRequest.setOrderId(billNo);
ThreadUtil.execAsync(() -> {
BaseResponse<String> stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + "");
});
}
updateReview(authAdmin, orderEntity);
IoOrderEntity orderEntity = orderService.findByBillNo(billNo);
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
reviewFinishRequest.setOrderId(billNo);
ThreadUtil.execAsync(() -> {
BaseResponse<String> stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + "");
});
}
updateReview(authAdmin, orderEntity);
}
}
@ -498,6 +501,29 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
return tempEntity;
}
//todo 这个有问题，自动赋码还有数据没补齐
private IoCodeTempEntity buildAutoCodeEntity(IoCollectOrderCodeAuto collectOrderCodeMan, IoOrderEntity orderEntity) {
IoCodeTempEntity tempEntity = new IoCodeTempEntity();
tempEntity.setOrderId(orderEntity.getBillNo());
tempEntity.setCode(collectOrderCodeMan.getUdiCode());
tempEntity.setRelId(collectOrderCodeMan.getRelId());
tempEntity.setMainAction(orderEntity.getMainAction());
tempEntity.setInvCode(orderEntity.getInvCode());
tempEntity.setBatchNo(collectOrderCodeMan.getBatchNo());
tempEntity.setProduceDate(collectOrderCodeMan.getProductDate());
tempEntity.setExpireDate(collectOrderCodeMan.getExpireDate());
tempEntity.setSerialNo(collectOrderCodeMan.getSerialNo());
tempEntity.setNameCode(collectOrderCodeMan.getUdiCode());
tempEntity.setCount(1);
tempEntity.setReCount(1);
tempEntity.setCreateTime(new Date());
tempEntity.setUpdateTime(new Date());
CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(tempEntity.getRelId());
if (udiRlSupEntity != null) tempEntity.setSupId(udiRlSupEntity.getCustomerId());
tempEntity.setDeptCode(orderEntity.getDeptCode());
return tempEntity;
}
@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
public Boolean orderUpload(String billNo, AuthAdmin authAdmin) {

Write Preview
Loading…
Cancel
Save