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

Merge remote-tracking branch 'origin/master'

Browse Source
master
郑明梁 2 years ago
parent 770405f62a f8a7c55c09
commit 261c0154be
8 changed files with 61 additions and 52 deletions
Show Stats Download Patch File Download Diff File

11
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -853,6 +853,11 @@ public class IoCodeTempController extends BaseController {
codeTempService.updateById(codeSaveRequest); codeTempService.updateById(codeSaveRequest);
} }
if(StrUtil.isNotEmpty(codeSaveRequest.getSupId())){
codeTempEntity.setSupId(codeSaveRequest.getSupId());
codeTempService.updateById(codeSaveRequest);
}
//更新耗材字典 //更新耗材字典
if (codeSaveRequest.getRelId() != null) { if (codeSaveRequest.getRelId() != null) {
@ -897,7 +902,7 @@ public class IoCodeTempController extends BaseController {
IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId()); IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
if (codeTempEntity.getMyCount() > 1) { if (codeTempEntity.getMyCount() > 1) {
codeTempEntity.setCount(codeTempEntity.getMyCount() - 1); codeTempEntity.setCount(codeTempEntity.getMyCount() - 1);
codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getActCount(codeTempEntity.getRelId())); codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
codeTempService.updateById(codeTempEntity); codeTempService.updateById(codeTempEntity);
} else { } else {
codeTempService.deleteById(id); codeTempService.deleteById(id);
@ -911,7 +916,7 @@ public class IoCodeTempController extends BaseController {
int orderReCount = orderDetailCodeEntity.getReCount(); int orderReCount = orderDetailCodeEntity.getReCount();
if (orderCount > 1) { if (orderCount > 1) {
orderDetailCodeEntity.setCount(orderCount - 1); orderDetailCodeEntity.setCount(orderCount - 1);
orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getActCount(codeTempEntity.getRelId())); orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
ioOrderDetailCodeService.update(orderDetailCodeEntity); ioOrderDetailCodeService.update(orderDetailCodeEntity);
} else { } else {
ioOrderDetailCodeService.deleteById(orderDetailCodeEntity.getId()); ioOrderDetailCodeService.deleteById(orderDetailCodeEntity.getId());
@ -952,7 +957,7 @@ public class IoCodeTempController extends BaseController {
if (codeTempEntity.getMyCount() <= 0) { if (codeTempEntity.getMyCount() <= 0) {
return ResultVOUtils.error(500, "数量不能小于0"); return ResultVOUtils.error(500, "数量不能小于0");
} }
codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getRelId())); codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
int b = codeTempService.updateById(codeTempEntity); int b = codeTempService.updateById(codeTempEntity);
if (b > 0) if (b > 0)
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");

2
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -139,7 +139,7 @@ public class IoOrderDetailBizController extends BaseController {
ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid()); ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode()); ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode());
ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc()); ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc());
ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh()); ioOrderDetailBizEntity.setCertCode(addBizProductReqeust.getZczbhhzbapzbh());
ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc()); ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc());
ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory()); ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname()); ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());

4
src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
Unescape Escape View File

@ -140,7 +140,7 @@ public class IoOrderReviewController extends BaseController {
for (IoOrderDetailResultResponse orderDetailResultResponse : orderDetailResultResponses) { for (IoOrderDetailResultResponse orderDetailResultResponse : orderDetailResultResponses) {
if (orderDetailResultResponse.getBindRlFk().longValue() == codeEntity.getRelId().longValue() && if (orderDetailResultResponse.getBindRlFk().longValue() == codeEntity.getRelId().longValue() &&
StrUtil.trimToEmpty(orderDetailResultResponse.getBatchNo()).equals(StrUtil.trimToEmpty(codeEntity.getBatchNo()))) { StrUtil.trimToEmpty(orderDetailResultResponse.getBatchNo()).equals(StrUtil.trimToEmpty(codeEntity.getBatchNo()))) {
orderDetailResultResponse.setAcceptCount(orderDetailResultResponse.getAcceptCount() + calCountUtil.getActCount(codeEntity.getRelId())); orderDetailResultResponse.setAcceptCount(orderDetailResultResponse.getAcceptCount() + calCountUtil.getActCount(codeEntity.getNameCode()));
if (orderDetailResultResponse.getAcceptCount() > orderDetailResultResponse.getCount()) { if (orderDetailResultResponse.getAcceptCount() > orderDetailResultResponse.getCount()) {
return ResultVOUtils.error(500, "数量溢出！"); return ResultVOUtils.error(500, "数量溢出！");
} }
@ -284,7 +284,7 @@ public class IoOrderReviewController extends BaseController {
&& checkOrderCodesBean.getMyCount() == checkOrderCodesBean.getScanCount()) { && checkOrderCodesBean.getMyCount() == checkOrderCodesBean.getScanCount()) {
return Constant.CHECK_REPEAT; return Constant.CHECK_REPEAT;
} }
int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getRelId()); int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode());
if (curCount == checkOrderCodesBean.getMyCount()) { if (curCount == checkOrderCodesBean.getMyCount()) {
checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED); checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED);
} }

4
src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
Unescape Escape View File

@ -417,7 +417,7 @@ public class IoAddInoutService {
codeEnttity.setDeptCode(orderEntity.getDeptCode()); codeEnttity.setDeptCode(orderEntity.getDeptCode());
codeEnttity.setOrderId(orderEntity.getBillNo()); codeEnttity.setOrderId(orderEntity.getBillNo());
codeEnttity.setInvCode(orderEntity.getInvCode()); codeEnttity.setInvCode(orderEntity.getInvCode());
codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getRelId())); codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode()));
codeEnttity.setUpdateTime(new Date()); codeEnttity.setUpdateTime(new Date());
codeEnttity.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate())); codeEnttity.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate()));
ioCodeEnttities.add(codeEnttity); ioCodeEnttities.add(codeEnttity);
@ -469,7 +469,7 @@ public class IoAddInoutService {
codeEnttity.setDeptCode(orderSaveRequest.getDeptCode()); codeEnttity.setDeptCode(orderSaveRequest.getDeptCode());
codeEnttity.setOrderId(orderSaveRequest.getBillNo()); codeEnttity.setOrderId(orderSaveRequest.getBillNo());
codeEnttity.setInvCode(orderSaveRequest.getInvCode()); codeEnttity.setInvCode(orderSaveRequest.getInvCode());
codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getRelId())); codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode()));
codeEnttity.setUpdateTime(new Date()); codeEnttity.setUpdateTime(new Date());
codeEnttity.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate())); codeEnttity.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate()));
ioCodeEnttities.add(codeEnttity); ioCodeEnttities.add(codeEnttity);

72
src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
Unescape Escape View File

@ -602,49 +602,53 @@ public class IoCheckInoutService {
} }
if (preInOrder.size() > 0) { if (preInOrder.size() > 0) {
String preInBillNo = ""; String preInBillNo = "";
boolean isBreak = false;
for (String key : preInOrder.keySet()) { for (String key : preInOrder.keySet()) {
preInBillNo = preInBillNo + "," + key; if (!isBreak) {
IoOrderEntity preInEntity = orderService.findByBillNo(key); preInBillNo = preInBillNo + "," + key;
preInEntity.setPreOutBillNo(orderEntity.getBillNo()); IoOrderEntity preInEntity = orderService.findByBillNo(key);
orderService.update(preInEntity); preInEntity.setPreOutBillNo(orderEntity.getBillNo());
orderService.update(preInEntity);
//预验收不删除单号，方便后续查询 BasicBussinessTypeEntity preBusType = basicBussinessTypeService.findByAction(preInEntity.getAction());
if (bussinessTypeEntity.isPreInBack()) { //预验收如果带回，则清空相关预验收库存； //预验收不删除单号，方便后续查询
invPreinDetailService.deleteByOrderId(preInEntity.getBillNo()); if (preBusType.isPreInBack()) { //预验收如果带回，则清空相关预验收库存；
} else { //预验收如果不带回，则清除已出库相关库存 invPreinDetailService.deleteByOrderId(preInEntity.getBillNo());
for (IoCodeEntity codeEntity : codeList) { } else { //预验收如果不带回，则清除已出库相关库存
if (StrUtil.isEmpty(codeEntity.getSerialNo())) { for (IoCodeEntity codeEntity : codeList) {
InvPreinDetailEntity invPreinDetailEntity = invPreinDetailService.findByCode(key, codeEntity.getCode()); if (StrUtil.isEmpty(codeEntity.getSerialNo())) {
if (invPreinDetailEntity != null) { InvPreinDetailEntity invPreinDetailEntity = invPreinDetailService.findByCode(key, codeEntity.getCode());
int count = 0; if (invPreinDetailEntity != null) {
if (invPreinDetailEntity.getCount() < codeEntity.getCount()) { int count = 0;
count = 0; if (invPreinDetailEntity.getCount() < codeEntity.getCount()) {
} else { count = 0;
count = invPreinDetailEntity.getCount() - codeEntity.getCount();
}
if (count >= 0) {
if (count == 0) {
invPreinDetailService.deleteByCode(key, codeEntity.getCode());
} else { } else {
invPreinDetailEntity.setCount(count); count = invPreinDetailEntity.getCount() - codeEntity.getCount();
invPreinDetailService.update(invPreinDetailEntity);
} }
int reCount = invPreinDetailEntity.getReCount() - codeEntity.getMyReCount(); if (count >= 0) {
if (reCount == 0) { isBreak = true;
invPreinDetailService.deleteByCode(key, codeEntity.getCode()); if (count == 0) {
} else { invPreinDetailService.deleteByCode(key, codeEntity.getCode());
invPreinDetailEntity.setReCount(reCount); } else {
invPreinDetailService.update(invPreinDetailEntity); invPreinDetailEntity.setCount(count);
invPreinDetailService.update(invPreinDetailEntity);
}
int reCount = invPreinDetailEntity.getReCount() - codeEntity.getMyReCount();
if (reCount == 0) {
invPreinDetailService.deleteByCode(key, codeEntity.getCode());
} else {
invPreinDetailEntity.setReCount(reCount);
invPreinDetailService.update(invPreinDetailEntity);
}
} }
} }
} else {
invPreinDetailService.deleteByCode(key, codeEntity.getCode());
} }
} else {
invPreinDetailService.deleteByCode(key, codeEntity.getCode());
} }
}
}
} }

10
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -256,7 +256,7 @@ public class IoOrderServiceImpl implements IoOrderService {
if (ioCodeEntity.getMyCount() > 1) { if (ioCodeEntity.getMyCount() > 1) {
//更新码表 //更新码表
ioCodeEntity.setCount(ioCodeEntity.getMyCount() - 1); ioCodeEntity.setCount(ioCodeEntity.getMyCount() - 1);
int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getRelId()); int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getNameCode());
ioCodeEntity.setReCount(ioCodeEntity.getMyReCount() - reCount); ioCodeEntity.setReCount(ioCodeEntity.getMyReCount() - reCount);
codeService.updateById(ioCodeEntity); //更新码详情 codeService.updateById(ioCodeEntity); //更新码详情
@ -287,7 +287,7 @@ public class IoOrderServiceImpl implements IoOrderService {
preinDetailService.deleteById(invPreinDetailEntity.getId()); preinDetailService.deleteById(invPreinDetailEntity.getId());
} else { } else {
invPreinDetailEntity.setCount(count); invPreinDetailEntity.setCount(count);
int reCount = udiCalCountUtil.getActCount(invPreinDetailEntity.getRelId()); int reCount = udiCalCountUtil.getActCount(invPreinDetailEntity.getNameCode());
invPreinDetailEntity.setReCount(invPreinDetailEntity.getReCount() - reCount); invPreinDetailEntity.setReCount(invPreinDetailEntity.getReCount() - reCount);
preinDetailService.update(invPreinDetailEntity); preinDetailService.update(invPreinDetailEntity);
} }
@ -300,7 +300,7 @@ public class IoOrderServiceImpl implements IoOrderService {
} else { } else {
//更新详情表 //更新详情表
invProductDetailEntity.setCount(count); invProductDetailEntity.setCount(count);
int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getRelId()); int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount); invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount);
invPreProductDetailService.update(invProductDetailEntity); invPreProductDetailService.update(invProductDetailEntity);
} }
@ -325,7 +325,7 @@ public class IoOrderServiceImpl implements IoOrderService {
} else { } else {
//更新详情表 //更新详情表
invProductDetailEntity.setCount(count); invProductDetailEntity.setCount(count);
int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getRelId()); int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode());
invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount); invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount);
invProductDetailService.update(invProductDetailEntity); invProductDetailService.update(invProductDetailEntity);
} }
@ -353,7 +353,7 @@ public class IoOrderServiceImpl implements IoOrderService {
if (ioCodeEntity.getCount() > 1) { if (ioCodeEntity.getCount() > 1) {
//删除一个条码 //删除一个条码
ioCodeEntity.setCount(ioCodeEntity.getCount() - 1); ioCodeEntity.setCount(ioCodeEntity.getCount() - 1);
int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getRelId()); int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getNameCode());
ioCodeEntity.setReCount(ioCodeEntity.getMyReCount() - reCount); ioCodeEntity.setReCount(ioCodeEntity.getMyReCount() - reCount);
codeTempService.updateById(ioCodeEntity); //更新码详情 codeTempService.updateById(ioCodeEntity); //更新码详情
} else { } else {

8
src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java
Unescape Escape View File

@ -14,10 +14,10 @@ public class UdiCalCountUtil {
UdiRelevanceService udiRelevanceService; UdiRelevanceService udiRelevanceService;
public int getActCount(Long relId) { // public int getActCount(Long relId) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(relId); // UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(relId);
return getActCount(udiRelevanceResponse); // return getActCount(udiRelevanceResponse);
} // }
public int getActCount(UdiRelevanceResponse udiRelevanceResponse) { public int getActCount(UdiRelevanceResponse udiRelevanceResponse) {
int actCount; int actCount;

2
src/main/resources/application.yml
Unescape Escape View File

@ -1,6 +1,6 @@
spring: spring:
profiles: profiles:
active: pro active: dev
jmx: jmx:
enabled: false enabled: false

Write Preview
Loading…
Cancel
Save