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

Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

Browse Source 
# Conflicts:
#	src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
panjc_field_management
yewj 8 months ago
parent f08e86703a 67d6056b66
commit 1e918222e1
9 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File

26
src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.thread.ThreadUtil;
import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.dto.DictDto;
import com.glxp.api.entity.thrsys.CodeRel;
@ -420,16 +421,23 @@ public class UdiRelevanceController extends BaseController {
udiProductService.updateLevelCount(udiRelevanceEntity);
try {
CodeRel codeRel = new CodeRel();
codeRel.setDiNameCode(udiProductEntity.getNameCode());
codeRel.setYbbm(udiProductEntity.getYbbm());
codeRel.setSptm(udiProductEntity.getSptm());
codeRel.setTyshxyh(udiProductEntity.getTyshxydm());
codeRel.setUpdateTime(new Date());
spsDirectClient.updateCodeRelDetail(codeRel);
} catch (Exception e) {
System.out.println("上传多码融合:" + e);
ThreadUtil.execAsync(() -> {
CodeRel codeRel = new CodeRel();
if(udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1){
codeRel.setDiNameCode(udiRelevanceSaveRequest.getNameCode());
}else {
codeRel.setDrugCode(udiRelevanceSaveRequest.getNameCode());
}
codeRel.setYbbm(udiRelevanceSaveRequest.getYbbm());
codeRel.setSptm(udiRelevanceSaveRequest.getSptm());
codeRel.setTyshxyh(udiRelevanceSaveRequest.getTyshxydm());
codeRel.setUpdateTime(new Date());
spsDirectClient.updateCodeRelDetail(codeRel);
});
}catch (Exception e){
System.out.println("上传多码融合:"+e);
}
return ResultVOUtils.success("更新成功");
}

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

@ -869,6 +869,14 @@ public class IoCodeTempController extends BaseController {
return ResultVOUtils.error(533, "扫码重复或当前追溯码已存在草稿单据中!");
}
}
//校验工位库存
// List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(addOrderRequest.getBillNo());
// for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
// //校验工位库存
// if (fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()){
// return ResultVOUtils.error(500, "当前码库存不足!");
// }
// }
}
//校验预验收是否已存在
if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
@ -1029,6 +1037,7 @@ public class IoCodeTempController extends BaseController {
}
}
if (exitLocalEntity == null) {
UdiRelevanceResponse udiRelevanceResponse1 = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
IoCodeTempEntity codeEnttity = new IoCodeTempEntity();
codeEnttity.setCode(code);
codeEnttity.setOrderId(orderId);
@ -1051,6 +1060,7 @@ public class IoCodeTempController extends BaseController {
codeEnttity.setRelId(addOrderRequest.getRelId());
codeEnttity.setFifoSplit(addOrderRequest.getFifoSplit());
codeEnttity.setCount(1);
codeEnttity.setPrice(udiRelevanceResponse1.getPrice());
String unitFk = null;
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
unitFk = addOrderRequest.getFromCorp();

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

@ -434,7 +434,7 @@ public class IoOrderController extends BaseController {
}
//校验工位库存
if (fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()){
return ResultVOUtils.error(500, "当前码:库存不足!");
return ResultVOUtils.error(500, "当前码:"+ fifoCodeEntity.getCode()+ "库存不足，请更改码明细!");
}
}
}

4
src/main/java/com/glxp/api/entity/thrsys/CodeRel.java
Unescape Escape View File

@ -73,8 +73,8 @@ public class CodeRel {
@TableField(value = "createTime")
public Date createTime;
@TableField(value = "fromtype")
public Integer fromtype;
@TableField(value = "fromType")
public Integer fromType;
}

1
src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java
Unescape Escape View File

@ -36,6 +36,7 @@ public class CollectOrderCodeManResponse {
private String ggxh;
private String batchNo;
private Integer scanCount;
private Integer scanActCount;
private String zczbhhzbapzbh;
private String manufactory;
private String productDate;

17
src/main/java/com/glxp/api/service/basic/UdiProductService.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.service.basic;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -318,13 +319,15 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
}
try {
CodeRel codeRel = new CodeRel();
codeRel.setDrugCode(udiProductEntity.getNameCode());
codeRel.setYbbm(udiProductEntity.getYbbm());
codeRel.setSptm(udiProductEntity.getSptm());
codeRel.setTyshxyh(udiProductEntity.getTyshxydm());
codeRel.setUpdateTime(new Date());
spsDirectClient.updateCodeRelDetail(codeRel);
ThreadUtil.execAsync(() -> {
CodeRel codeRel = new CodeRel();
codeRel.setDrugCode(udiProductEntity.getNameCode());
codeRel.setYbbm(udiProductEntity.getYbbm());
codeRel.setSptm(udiProductEntity.getSptm());
codeRel.setTyshxyh(udiProductEntity.getTyshxydm());
codeRel.setUpdateTime(new Date());
spsDirectClient.updateCodeRelDetail(codeRel);
});
} catch (Exception e) {
System.out.println("上传多码融合:" + e);
}

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

@ -2,6 +2,7 @@ package com.glxp.api.service.collect;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@ -213,7 +214,9 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
reviewFinishRequest.setOrderId(collectOrder.getBillNo());
BaseResponse<String> stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + "");
ThreadUtil.execAsync(() -> {
BaseResponse<String> stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + "");
});
}
updateReview(authAdmin,orderEntity);
}

5
src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
Unescape Escape View File

@ -413,7 +413,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
}
collectOrderBizService.saveOrUpdate(collectOrderBiz);
int count = 0;
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && exitCode != null) {
exitCode.setScanCount(IntUtil.value(exitCode.getScanCount()) + 1);
exitCode.setScanActCount(IntUtil.value(exitCode.getScanActCount()) + scanCount);
@ -435,7 +435,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
.createUser(userId)
.updateTime(new Date())
.updateUser(userId)
.scanCount(1)
.scanCount(count + 1)
// .scanCount(scanCount)
.isSplitCode(addTagCodeReqeust.getIsSplitCode())
.scanActCount(scanCount)
.build();

2
src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
Unescape Escape View File

@ -205,6 +205,6 @@
</if>
and (pur_apply.status = 3 or saf.status = 3)
</where>
# GROUP BY basic_products.uuid
GROUP BY basic_products.uuid
</select>
</mapper>

Write Preview
Loading…
Cancel
Save