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

相关bug修改

Browse Source
pro
anthonywj 2 years ago
parent 320b8f0487
commit 374f8261f8
13 changed files with 157 additions and 35 deletions
Show Stats Download Patch File Download Diff File

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

@ -723,6 +723,23 @@ public class IoCodeTempController extends BaseController {
// if (DateUtil.)
// }
genDetaiEntity = codeEnttity;
if (baseResponse == null) {
baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
if (baseResponse != null)
return baseResponse;
} else {
if (baseResponse.getCode() == 501) {
return baseResponse;
} else if (baseResponse.getCode() == 502) {
return baseResponse;
}
checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
return baseResponse;
}
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity);
if (invRes != null) {
@ -743,22 +760,6 @@ public class IoCodeTempController extends BaseController {
}
}
genDetaiEntity = codeEnttity;
if (baseResponse == null) {
baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
if (baseResponse != null)
return baseResponse;
} else {
if (baseResponse.getCode() == 501) {
return baseResponse;
} else if (baseResponse.getCode() == 502) {
return baseResponse;
}
checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
return baseResponse;
}
//是否边扫边校验
if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
String errMsg = ioCheckInoutService.checkCode(codeEnttity);
@ -787,9 +788,15 @@ public class IoCodeTempController extends BaseController {
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_ADVANCE);
int count = 0;
if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) {
count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), null);
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
count = invPreProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), invWarehouseEntity.getCode(), null, codeTempEntity.getCode());
} else
count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), null);
} else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) {
count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode());
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
count = invPreProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode(), codeTempEntity.getCode());
} else
count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode());
} else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
//按指定货位出库
if (StrUtil.isEmpty(codeTempEntity.getPreSpaceCode())) {
@ -806,7 +813,10 @@ public class IoCodeTempController extends BaseController {
return ResultVOUtils.error(500, "添加失败，该产品未上架货位!");
}
} else {
count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode());
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
count = invPreProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode(), codeTempEntity.getCode());
} else
count = invPreProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreSpaceCode());
}
}
@ -844,9 +854,15 @@ public class IoCodeTempController extends BaseController {
int count = 0;
if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) {
count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), null);
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
count = invPreinProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), invWarehouseEntity.getCode(), null, codeTempEntity.getCode());
} else
count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), null);
} else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) {
count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreInSpaceCode());
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
count = invPreinProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), invWarehouseEntity.getCode(), codeTempEntity.getPreInSpaceCode(), codeTempEntity.getCode());
} else
count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreInSpaceCode());
} else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
//按指定货位出库
if (StrUtil.isEmpty(codeTempEntity.getPreSpaceCode())) {
@ -863,7 +879,10 @@ public class IoCodeTempController extends BaseController {
return ResultVOUtils.error(500, "添加失败，该产品未上架货位!");
}
} else {
count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, codeTempEntity.getInvCode(), codeTempEntity.getPreInSpaceCode());
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
count = invPreinProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getPreInSpaceCode(), codeTempEntity.getCode());
} else
count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, codeTempEntity.getInvCode(), codeTempEntity.getPreInSpaceCode());
}
}
@ -1036,9 +1055,15 @@ public class IoCodeTempController extends BaseController {
if (bussinessTypeEntity.isVailInv() && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
int count = 0;
if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) {
count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null);
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
count = invProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null, codeTempEntity.getCode());
} else
count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null);
} else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) {
count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode());
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
count = invProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(), codeTempEntity.getCode());
} else
count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode());
} else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
//按指定货位出库
if (StrUtil.isEmpty(codeTempEntity.getWarehouseCode())) {
@ -1054,7 +1079,10 @@ public class IoCodeTempController extends BaseController {
return ResultVOUtils.error(500, "添加失败，该产品未上架货位!");
}
} else {
count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode());
if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
count = invProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(), codeTempEntity.getCode());
} else
count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode());
}
}
if (count <= 0) {
@ -1231,6 +1259,20 @@ public class IoCodeTempController extends BaseController {
IoCodeTempEntity tempEntity = codeTempService.selectById(codeTempEntity.getId());
codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(tempEntity.getAction());
BaseResponse invRes = null;
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
invRes = checkPreInInv(bussinessTypeEntity, codeTempEntity);
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
invRes = checkPreInv(bussinessTypeEntity, codeTempEntity);
} else {
invRes = checkInv(bussinessTypeEntity, codeTempEntity);
}
if (invRes != null) {
return invRes;
}
int count = tempEntity.getCount() - codeTempEntity.getCount();
//更新扫码详情

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

@ -152,13 +152,11 @@ public class IoOrderController extends BaseController {
List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest);
BigDecimal amount = new BigDecimal(0.00);
for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
if (ioOrderDetailCodeRespons.getReCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getReCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
}
}
ioOrderResponse.setAllAmount(amount);
}

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

@ -662,6 +662,7 @@ public class IoOrderDetailBizController extends BaseController {
}
//updateInvoiceStaus
@PostMapping("/udiwms/inout/biz/updateorderBiz")
public BaseResponse updateorderBiz(@RequestBody List<IoOrderDetailCodeEntity> list) {
for (IoOrderDetailCodeEntity ioOrderDetailBizEntity : list) {
@ -682,8 +683,8 @@ public class IoOrderDetailBizController extends BaseController {
public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) {
List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(orderDetailBizRequest);
for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
if (ioOrderDetailCodeRespons.getReCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getReCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
}
String msg = "";
IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();

3
src/main/java/com/glxp/api/res/thrsys/ThrOrderUploadLogResponse.java
Unescape Escape View File

@ -1,12 +1,13 @@
package com.glxp.api.res.thrsys;
import com.glxp.api.entity.inout.IoOrderUploadLogEntity;
import lombok.Data;
/**
* 单据上传日志响应参数
*/
@Data
public class ThrOrderUploadLogResponse {
public class ThrOrderUploadLogResponse extends IoOrderUploadLogEntity {
/**
* 单据类型名称

2
src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java
Unescape Escape View File

@ -57,5 +57,7 @@ public interface InvPreProductDetailService {
int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode);
int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code);
List<InvPlaceDetailResponse> findByGroupCode(String invCode, String code);
}

2
src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java
Unescape Escape View File

@ -62,6 +62,8 @@ public interface InvPreinProductDetailService {
int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode);
int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code);
List<InvPlaceDetailResponse> findByGroupCode(String invCode, String code);
List<InvPreInProductDetailEntity> findBySpaceList(List<String> spaceList);

2
src/main/java/com/glxp/api/service/inv/InvProductDetailService.java
Unescape Escape View File

@ -51,6 +51,8 @@ public interface InvProductDetailService {
int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode);
int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code);
List<InvPlaceDetailResponse> findByGroupCode(String invCode, String code);

22
src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java
Unescape Escape View File

@ -17,6 +17,7 @@ import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
import com.glxp.api.entity.inv.InvPreProductDetailEntity;
import com.glxp.api.entity.inv.InvPreinDetailEntity;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
import com.glxp.api.req.inv.FilterInvProductDetailRequest;
import com.glxp.api.res.inv.InvPlaceDetailResponse;
@ -233,6 +234,27 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
return count;
}
@Override
public int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code) {
List<InvPreInProductDetailEntity> datas =
invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>().eq("deptCode", deptCode).eq("invCode", invCode)
.eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
.eq("code", code)
);
int count = 0;
if (CollUtil.isNotEmpty(datas)) {
for (InvPreInProductDetailEntity invProductDetailEntity : datas) {
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT))
count = count + invProductDetailEntity.getReCount();
else {
count = count - invProductDetailEntity.getReCount();
}
}
}
return count;
}
@Override
public List<InvPlaceDetailResponse> findByGroupCode(String invCode, String code) {

21
src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
Unescape Escape View File

@ -209,6 +209,27 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
return count;
}
@Override
public int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code) {
List<InvPreProductDetailEntity> datas =
invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>().eq("deptCode", deptCode).eq("invCode", invCode)
.eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
.eq("code", code)
);
int count = 0;
if (CollUtil.isNotEmpty(datas)) {
for (InvPreProductDetailEntity invProductDetailEntity : datas) {
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT))
count = count + invProductDetailEntity.getReCount();
else {
count = count - invProductDetailEntity.getReCount();
}
}
}
return count;
}
@Override
public List<InvPlaceDetailResponse> findByGroupCode(String invCode, String code) {

25
src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java
Unescape Escape View File

@ -183,7 +183,30 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
}
List<InvProductDetailEntity> datas =
invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
.isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode).eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode));
.isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode)
.eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
);
int count = 0;
if (CollUtil.isNotEmpty(datas)) {
for (InvProductDetailEntity invProductDetailEntity : datas) {
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT))
count = count + invProductDetailEntity.getReCount();
else {
count = count - invProductDetailEntity.getReCount();
}
}
}
return count;
}
@Override
public int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code) {
List<InvProductDetailEntity> datas =
invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>().eq("deptCode", deptCode).eq("invCode", invCode)
.eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
.eq("code", code)
);
int count = 0;
if (CollUtil.isNotEmpty(datas)) {

7
src/main/java/com/glxp/api/util/IntUtil.java
Unescape Escape View File

@ -16,6 +16,13 @@ public class IntUtil {
}
public static boolean value(Boolean value) {
if (value == null)
return false;
else return value;
}
public static boolean value(Boolean value) {
if (value == null)
return false;

3
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -277,7 +277,8 @@
</foreach>
</if>
<if test="flbm != '' and flbm != null">
and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm} or tp.cplb = #{flbm})
and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm} or tp.cplb = #{flbm} or
basic_udirel.relCode = #{flbm})
</if>
<if test="companyName != '' and companyName != null">
AND basic_corp.name like concat('%', #{companyName}, '%')

2
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -487,6 +487,6 @@ CALL Pro_Temp_ColumnWork('basic_products', 'pinyinInitial', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('thr_order_upload_bustypes', 'orderStatus', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('thr_order_upload_bustypes', 'orderStartTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('thr_order_upload_bustypes', 'orderSource', 'varchar(1024)', 1);
CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'topInvCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'topInvSpaceCode', 'varchar(255)', 1);

Write Preview
Loading…
Cancel
Save