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

代码备份

Browse Source
dev_fifo_z
yewj 10 months ago
parent a6469784e2
commit bab8df30a6
6 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File

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

@ -1737,13 +1737,15 @@ public class IoCodeTempController extends BaseController {
} else {
//判断产品是否已经绑定其他槽位
SysWorkplaceQueue workplaceQueue1 = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, udiRelevanceResponse.getId()));
String freightCode = workplaceQueue1.getFreightCode();
SysWorkplaceFreight one = sysWorkplaceFreightService.getOne(new LambdaQueryWrapper<SysWorkplaceFreight>().eq(SysWorkplaceFreight::getCode,freightCode));
Integer isSingQueue = one.getIsSingQueue();
if (workplaceQueue1 != null && isSingQueue == 1) {
if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) {
if (workplaceQueue1 != null) {
String freightCode = workplaceQueue1.getFreightCode();
SysWorkplaceFreight one = sysWorkplaceFreightService.getOne(new LambdaQueryWrapper<SysWorkplaceFreight>().eq(SysWorkplaceFreight::getCode, freightCode));
Integer isSingQueue = one.getIsSingQueue();
if (workplaceQueue1 != null && isSingQueue == 1) {
if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) {
// orderService.deleteByBillNo(orderId);
return ResultVOUtils.error(507, "当前货架已启用单品种槽位且产品已绑定在" + workplaceQueue1.getCode() + "取货槽");
return ResultVOUtils.error(507, "当前货架已启用单品种槽位且产品已绑定在" + workplaceQueue1.getCode() + "取货槽");
}
}
}
}

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

@ -109,7 +109,7 @@ public class IoSplitFifoInvController extends BaseController {
*/
@GetMapping("/udiwms/ioSplit/inv/codeList")
public BaseResponse getCodeList(IoSplitFifoCodeEntity ioSplitFifoCodeEntity) {
if (ioSplitFifoCodeEntity == null || StrUtil.isEmpty(ioSplitFifoCodeEntity.getWorkPlaceQueueCode())){
if (ioSplitFifoCodeEntity == null || StrUtil.isEmpty(ioSplitFifoCodeEntity.getWorkPlaceQueueCode())) {
return ResultVOUtils.error("入参错误");
}
List<String> codeList = ioSplitFifoCodeService.getCodeList(ioSplitFifoCodeEntity.getWorkPlaceQueueCode());

7
src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java
Unescape Escape View File

@ -136,6 +136,13 @@ public class IoOrderEntity {
@TableField(value = "invCode")
private String invCode;
/**
* 仓库ID
*/
@TableField(value = "warehouseId")
private Long warehouseId;
/**
* 单据流转
*/

13
src/main/java/com/glxp/api/http/ErpBasicClient.java
Unescape Escape View File

@ -278,18 +278,18 @@ public class ErpBasicClient {
public BaseResponse postOrder(PostCollectOrderRequest postOrderRequest) {
ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(postOrderRequest.getThirdSys());
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/uploadCollectOrder";
String response=null;
String response = null;
try {
response = HttpUtil.post(url,JSONUtil.toJsonStr(postOrderRequest));
response = HttpUtil.post(url, JSONUtil.toJsonStr(postOrderRequest));
// response = httpOkClient.uCloudPost(url, postOrderRequest);
if (StrUtil.isEmpty(response)) {
return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
}
// 判断不是
return JSONUtil.toBean(response,BaseResponse.class);
return JSONUtil.toBean(response, BaseResponse.class);
} catch (Exception e) {
log.error("获取医保单据信息原来数据==="+response);
log.error("获取医保单据信息原来数据===" + response);
log.error("获取医保单据信息", e);
return ResultVOUtils.error(500, "连接第三方系统接口服务出错" + e.getMessage());
@ -529,10 +529,7 @@ public class ErpBasicClient {
}
public BaseResponse<Map<String, String[]>> putGoodsA001(PutGoodsA001Request putGoodsA001Request,String thirdSys) {
public BaseResponse<Map<String, String[]>> putGoodsA001(PutGoodsA001Request putGoodsA001Request, String thirdSys) {
ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSys);
String url = basicThirdSysEntity.getThridUrl() + "/drugMachine/putGoods/A001";
try {

10
src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
Unescape Escape View File

@ -872,6 +872,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
}
@Transactional(rollbackFor = Exception.class)
public void confirmFinishOrder(CollectOrderRequest collectOrderRequest, AuthAdmin authAdmin) {
IoCollectOrder collectOrder = new IoCollectOrder();
BeanUtils.copyProperties(collectOrderRequest, collectOrder);
@ -882,10 +883,19 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
ioCollectOrderBackupService.save(ioCollectOrderBackup);
ArrayList<IoCollectOrderBizBackup> ioCollectOrderBizBackups = new ArrayList<>();
List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs) {
IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup);
ioCollectOrderBizBackups.add(ioCollectOrderBizBackup);
}
ioCollectOrderBizBackupService.saveBatch(ioCollectOrderBizBackups);
//删除原来单据
removeOrderByBillNo(collectOrder);
ThreadUtil.execAsync(() -> {
//插入到码表
collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());

7
src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
Unescape Escape View File

@ -193,9 +193,11 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
if (count > 0) {
ioSplitCodeEntity.setRemainCount(count);
splitCodeMapper.updateById(ioSplitCodeEntity);
unCount = 0;
break;
} else if (count == 0) {
ioSplitCodeEntity.setRemainCount(0);
unCount = 0;
splitCodeMapper.updateById(ioSplitCodeEntity);
} else {
ioSplitCodeEntity.setRemainCount(0);
@ -411,6 +413,9 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
public ConfirmResponse confirmBizAutiTagCode(IoCollectOrderBiz collectOrderBiz, String queueCode, String confirmSplitCode, Boolean skipSplitConfirm) {
ConfirmResponse confirmResponse = new ConfirmResponse();
IoCollectOrder collectOrder = collectOrderService.getByBillNo(collectOrderBiz.getOrderIdFk());
if (collectOrder == null) {
throw new JsonException(500, "提交失败，未找到对应的单据！");
}
SysWorkplacePutRel sysWorkplacePutRel = workplacePutRelService.findPutWorkPlace(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
Long putWorkPlaceCode = null;
if (sysWorkplacePutRel != null)
@ -458,7 +463,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
}
// 判断是否需要拆零确认：整箱数量大于1且有拆零数量且没有足够的拆零数量
boolean needSplitConfirm = quotient > 1 && remainder > 0 && !hasEnoughSplitCount;
boolean needSplitConfirm = quotient > 0 && remainder > 0 && !hasEnoughSplitCount;
// 如果是第一次调用（confirmSplitCode为空）且需要拆零确认且不跳过拆零确认，只返回拆零信息
if (StrUtil.isEmpty(confirmSplitCode) && needSplitConfirm && !IntUtil.value(skipSplitConfirm)) {

Write Preview
Loading…
Cancel
Save