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

优化 service

Browse Source
dev_2.5_ocean
qiuyt 6 months ago
parent 1696972fdb
commit 313cdd33a0
163 changed files with 102 additions and 5083 deletions
Show Stats Download Patch File Download Diff File

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

@ -2202,10 +2202,7 @@ public class IoCodeTempController extends BaseController {
} else {
IoCodeEntity ioCodeEntity = new IoCodeEntity();
BeanUtils.copyProperties(codeEnttity, ioCodeEntity);
String supId = transInoutService.checkInvExitSup(ioCodeEntity);
if (supId == null) {
supId = transInoutService.checkExitSup(codeEnttity);
}
String supId = transInoutService.checkExitSup(codeEnttity);
if (supId == null) {
codeEnttity.setSupId(null);
BaseResponse baseResponse = ResultVOUtils.error(503, "该产品未绑定供应商,请指定对应的供应商");

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

@ -192,6 +192,15 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
//todo
buildInnerOrder(collectOrder, sysWorkplaceDocumentEntity);
} else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() != 1) {
//更新单据为已完成
// IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo());
//// orderEntity.setStatus(7);
//// orderEntity.setFromType(2);
//// orderEntity.setDealStatus(3);
//// orderEntity.setAuditTime(new Date());
//// orderService.update(orderEntity);
//// //推送自助平台
//// spGetHttpClient.updateCheckStatus(orderEntity, collectOrder.getCreateUser());
IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo());
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
@ -213,6 +222,23 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
}
}
// //插入处方备份表
// IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
// BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
// boolean save = ioCollectOrderBackupService.save(ioCollectOrderBackup);
// if (!save){
// throw new JsonException(500,"处方备用上传失败");
// }
// List<IoCollectOrderBiz> ioCollectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
// for (IoCollectOrderBiz ioCollectOrderBiz : ioCollectOrderBizs){
// IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
// BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup);
// boolean save1 = ioCollectOrderBizBackupService.save(ioCollectOrderBizBackup);
// if (!save1){
// throw new JsonException(500,"处方备用明细上传失败");
// }
// }
}
/**
@ -441,6 +467,11 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
} else {
throw new JsonException("连接第三方系统接口服务出错，" + baseResponse.getMessage());
}
// if (baseResponse.getCode() == 520) {
// Log.error("上传失败，" + baseResponse.getMessage());
// } else {
// throw new JsonException("连接第三方系统接口服务出错，" + baseResponse.getMessage());
// }
}
@ -551,8 +582,32 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
}
// public List<CollectOrderBizResponse> setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
// List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterListByBillNo(collectOrderBizRequest);
// List<IoCollectCodeBackup> ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());;
// List<CollectOrderBizResponse> collectOrderBizResponses = new ArrayList<>();
// for (CollectOrderBizResponse collectOrderBiz : list) {
// CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse();
// BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse);
// //查询手动赋码的code
// for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(collectOrderBizResponse.getNameCode());
// if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
// collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
// }
// }
// if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())){
// collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
// }
// collectOrderBizResponses.add(collectOrderBizResponse);
// }
//
// return collectOrderBizResponses;
// }
public List<CollectOrderBizResponse> setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterListByBillNo(collectOrderBizRequest);
List<IoCollectCodeBackup> ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());
List<CollectOrderBizResponse> collectOrderBizResponses = new ArrayList<>();
Map<String, UdiRelevanceResponse> udiRelevanceMap = new HashMap<>();
@ -563,6 +618,18 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
for (CollectOrderBizResponse collectOrderBiz : list) {
CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse();
BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse);
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceMap.get(collectOrderBizResponse.getNameCode());
if (udiRelevanceResponse != null) {
// for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
// if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
// collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
// }
// }
// if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
// collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
// }
}
collectOrderBizResponses.add(collectOrderBizResponse);
}

34
src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java
Unescape Escape View File

@ -29,9 +29,6 @@ public class IoCollectOrderBizBackupService extends ServiceImpl<IoCollectOrderBi
IoCollectOrderBizBackupMapper ioCollectOrderBizBackupMapper;
@Resource
private ErpBasicClient erpBasicClient;
@Resource
private IoCollectCodeBackMapper ioCollectCodeBackMapper;
public List<CollectOrderBizResponse> filterList(CollectOrderBizRequest collectOrderRequest) {
if (collectOrderRequest == null) {
return Collections.emptyList();
@ -52,19 +49,13 @@ public class IoCollectOrderBizBackupService extends ServiceImpl<IoCollectOrderBi
Map<String, String[]> buyTypeMap = new HashMap<>();
List<String> buyTypeBuyer = new ArrayList<>();
List<String> buyTypeSales = new ArrayList<>();
// Integer buyerCount = 0;
// Integer salesCount = 0;
Integer buyerScanCount = 0;
Integer salesScanCount = 0;
BigDecimal buyerCentage = new BigDecimal(0);
BigDecimal salesCentage = new BigDecimal(0);
Integer codeCount = 0;
Integer fifoSplitOneCount = 0;
Integer fifoSplitTwoCount = 0;
if (list != null && list.size() > 0) {
BaseResponse<Map<String, String[]>> baseResponse = erpBasicClient.getBuyType("thirdId");
if (baseResponse.getCode() == 20000) {
@ -75,13 +66,9 @@ public class IoCollectOrderBizBackupService extends ServiceImpl<IoCollectOrderBi
buyTypeSales = new ArrayList<>(Arrays.asList(buyTypeMap.get("buyType_3505")));
buyTypeSales.addAll(Arrays.asList(buyTypeMap.get("buyType_3506")));
}
for (CollectOrderBizResponse collectOrderBizResponse : list) {
collectOrderBizResponse.setCount(collectOrderBizResponse.getCount() == null ? 0 : collectOrderBizResponse.getCount());
collectOrderBizResponse.setScanCount(collectOrderBizResponse.getScanCount() == null ? 0 : collectOrderBizResponse.getScanCount());
if(2 == collectOrderBizResponse.getUploadStatus()){
for (String buyType : buyTypeSales) {
if (buyType.equals(collectOrderBizResponse.getBusType())) {
@ -127,25 +114,6 @@ public class IoCollectOrderBizBackupService extends ServiceImpl<IoCollectOrderBi
}
}
// 计算采购率和销售率
// BigDecimal buyerCountBigDecimal = BigDecimal.valueOf(buyerCount);
// BigDecimal buyerScanCountBigDecimal = BigDecimal.valueOf(buyerScanCount);
// if(buyerCountBigDecimal.equals(new BigDecimal(0))){
// buyerCentage = new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP);
// }else {
// buyerCentage = buyerScanCountBigDecimal.divide(buyerCountBigDecimal,4, BigDecimal.ROUND_HALF_UP ).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
// }
//
// BigDecimal salesCountBigDecimal = BigDecimal.valueOf(salesCount);
// BigDecimal salesScanCountBigDecimal = BigDecimal.valueOf(salesScanCount);
// if(salesCountBigDecimal.equals(new BigDecimal(0))){
// salesCentage = new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP);
// }else {
// salesCentage = salesScanCountBigDecimal.divide(salesCountBigDecimal,4, BigDecimal.ROUND_HALF_UP ).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
// }
// codeCount = buyerScanCount + salesScanCount;
}
@ -155,8 +123,6 @@ public class IoCollectOrderBizBackupService extends ServiceImpl<IoCollectOrderBi
collectOrderUploadCountResponse.setBuyerScanCount(buyerScanCount);
collectOrderUploadCountResponse.setSalesScanCount(salesScanCount);
collectOrderUploadCountResponse.setCodeCount(codeCount);
// collectOrderUploadCountResponse.setCount(buyerCount+salesCount);
collectOrderUploadCountResponse.setFifoSplitOneCount(fifoSplitOneCount);
collectOrderUploadCountResponse.setFifoSplitTwoCount(fifoSplitTwoCount);

13
src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java
Unescape Escape View File

@ -69,19 +69,6 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
}
sb.append(layer + "层");
}
// if (collectOrderBizResponse.getQueueName() != null && !collectOrderBizResponse.getQueueName().isEmpty()) {
// if (sb.length() > 0) {
// sb.append("-");
// }
// sb.append(collectOrderBizResponse.getQueueName());
// }
// if (collectOrderBizResponse.getWorkplaceQueueCode() != null && !collectOrderBizResponse.getWorkplaceQueueCode().isEmpty()) {
// if (sb.length() > 0) {
// sb.append("-");
// }
// sb.append("(").append(collectOrderBizResponse.getWorkplaceQueueCode()).append(")");
// }
return sb.toString();
}

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

@ -129,10 +129,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
return collectOrderCodeManMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>().eq(IoCollectOrderCodeMan::getOrderIdFk, billNo)
.eq(IoCollectOrderCodeMan::getUdiCode, code).last("limit 1"));
}
@Resource
InvWarehouseService invWarehouseService;
@Resource
SysWorkplacePutRelService workplacePutRelService;
@Resource
@ -197,23 +193,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
}
}
// todo 校验是否存在码表
//单据设置 是否开启 寄售预验收扫码校验
// 产品采购类型
// 拿到产品采购类型
// code purType 查找 io_collect_code_backup 是否存在 不存在 提示 当前码未进入预验收/寄售库
// if (IntUtil.value(collectSet.getIsScanCodeCheck())) {
// if (IntUtil.value(udiRelevanceResponse.getPurType()) != 1 && IntUtil.value(udiRelevanceResponse.getPurType()) != 0) {
// IoCollectCodeBackup collectCodeBackup = ioCollectCodeBackService.getOne(new LambdaQueryWrapper<IoCollectCodeBackup>()
// .eq(IoCollectCodeBackup::getCode, code)
// .eq(IoCollectCodeBackup::getPurType, udiRelevanceResponse.getPurType()));
// if (collectCodeBackup == null) {
// String PurTypeName = IntUtil.value(udiRelevanceResponse.getPurType()) == 2 ? "预验收" : "寄售";
// throw new JsonException(500, "当前产品追溯码未进入" + PurTypeName + "库");
// }
// }
// }
//2-1.校验预验收库存是否已存在
String preInBillNo = addTagCodeReqeust.getPreInBillNo();
String orderId = addTagCodeReqeust.getBillNo();
@ -297,10 +276,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
collectOrder.setShipper(addTagCodeReqeust.getShipper());
collectOrder.setShipperName(addTagCodeReqeust.getShipperName());
}
// if (StrUtil.isNotEmpty(addTagCodeReqeust.getInvCode())) {
// InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addTagCodeReqeust.getInvCode());
// collectOrder.setShipperName(invWarehouseEntity.getName());
// }
if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1) {
collectOrder.setFromType("药械追溯管理系统");
} else {
@ -574,12 +549,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
if (relCodeDetail != null) {
collectOrderCodeMan.setGrantPaCode(relCodeDetail.getParentCode());
}
// if (StrUtil.isEmpty(collectOrderCodeMan.getBatchNo())) {
//当关联关系存在的时候 以关联关系为准
collectOrderCodeMan.setBatchNo(codeRelEntity.getBatchNo());
collectOrderCodeMan.setProductDate(codeRelEntity.getMadeDate() + "");
collectOrderCodeMan.setExpireDate(codeRelEntity.getValidateDate() + "");
// }
}
this.save(collectOrderCodeMan);
}

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

@ -777,97 +777,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
@Resource
IoCollectOrderBizBackupService ioCollectOrderBizBackupService;
/**
* @param billNo
*/
// @Transactional(rollbackFor = Exception.class)
// public void generateOrder(String billNo) {
//
// IoCollectOrder collectOrder = getByBillNo(billNo);
// SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
// //1.内部系统，且单据为扫码生成业务单则创建系统单据
// if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() == 1) {
// List<IoCollectOrderCodeMan> collectOrderCodes = collectOrderCodeManService.listByBillNo(collectOrder.getBillNo());
// BasicBussinessTypeEntity bussinessTypeEntity;
// sysWorkplaceDocumentEntity.getInoutType();
//
// //构造单据数据
// IoOrderEntity orderEntity = new IoOrderEntity();
// bussinessTypeEntity = bussinessTypeService.findByAction(sysWorkplaceDocumentEntity.getDocumentTypeCode());
// orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
// orderEntity.setAction(bussinessTypeEntity.getAction());
// orderEntity.setCreateTime(new Date());
// orderEntity.setInvCode(sysWorkplaceDocumentEntity.getInvCode() + "");
// orderEntity.setDeptCode("");
// orderEntity.setFromCorp(collectOrder.getFromCorp());
// orderEntity.setCorpOrderId(CustomUtil.getId() + "x");
// orderEntity.setExportStatus(0);
// orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_PROCESS);
// orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
// orderEntity.setCreateUser(collectOrder.getCreateUser());
// orderEntity.setCreateTime(new Date());
// orderEntity.setUpdateUser(collectOrder.getCreateUser());
// orderEntity.setUpdateTime(new Date());
// orderEntity.setCustomerId("110");
// orderEntity.setOrderType(2);
// orderEntity.setFromType(2);
// String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
// orderEntity.setBillNo(orderNo);
// List<IoCodeTempEntity> lossCodesList = new ArrayList<>();
//
// for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodes) {
// lossCodesList.add(buildCodeEntity(collectOrderCodeMan, orderEntity));
// }
// orderService.insertOrder(orderEntity);
// codesTempDao.insertBatch(lossCodesList);
// addInoutService.dealProcess(orderEntity);
// if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
// ioCheckInoutService.check(orderEntity.getBillNo());
// }
// } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() != 1) {
// //更新单据为已完成
// IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo());
// orderEntity.setStatus(7);
// orderService.update(orderEntity);
// } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 0) {
// //todo 根据单据类型上传医保或者第三方系统
// PostCollectOrderRequest orderRequest = new PostCollectOrderRequest();
// orderRequest.setThirdSys("thirdId");
// CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
// collectOrderBizRequest.setOrderIdFk(collectOrder.getBillNo());
// List<CollectOrderBizResponse> collectOrderBizResponses = combieOrderDetail(collectOrderBizRequest);
// collectOrder.setCollectOrderBizResponseList(collectOrderBizResponses);
// List<IoCollectOrder> collectOrderList = new ArrayList<>();
// collectOrderList.add(collectOrder);
// orderRequest.setCollectOrderList(collectOrderList);
// BaseResponse<BasicSkPrescribeResponse> baseResponse = erpBasicClient.postOrder(orderRequest);
// log.debug("单据返回=========" + baseResponse);
// if (baseResponse.getCode() == 20000) {
// //
// } else {
// throw new JsonException("连接第三方系统接口服务出错，" + baseResponse.getMessage());
// }
//
// }
// //插入处方备份表
// IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
// BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
// boolean save = ioCollectOrderBackupService.save(ioCollectOrderBackup);
// if (!save){
// throw new JsonException(500,"处方备用上传失败");
// }
// List<IoCollectOrderBiz> ioCollectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
// for (IoCollectOrderBiz ioCollectOrderBiz : ioCollectOrderBizs){
// IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
// BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup);
// boolean save1 = ioCollectOrderBizBackupService.save(ioCollectOrderBizBackup);
// if (!save1){
// throw new JsonException(500,"处方备用明细上传失败");
// }
// }
//
//
// }
@Resource
UdiRlSupService udiRlSupService;

2
src/main/java/com/glxp/api/service/collect/IoCollectSetService.java
Unescape Escape View File

@ -11,7 +11,7 @@ import com.glxp.api.dao.collect.IoCollectSetMapper;
public class IoCollectSetService extends ServiceImpl<IoCollectSetMapper, IoCollectSet> {
public IoCollectSet getSet() {
List<IoCollectSet> collectSets = new ArrayList<>();
List<IoCollectSet> collectSets;
try {
collectSets = this.list();
}catch (Exception e){

3
src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
Unescape Escape View File

@ -187,7 +187,6 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
}
//可用数量
splitFifoInv.setAvailableCount(availableCount);
// splitFifoInv.setInCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount());//入库数量
splitFifoInv.setUpdateTime(new Date());
//更改 库存
boolean update = ioSplitFifoInvService.updateById(splitFifoInv);
@ -197,7 +196,6 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
//todo 码明细删减库存
IoSplitFifoCodeEntity splitFifoCodeEntity = splitFifoCodeService.getOne(new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
.eq(IoSplitFifoCodeEntity::getWorkPlaceCode, splitFifoInv.getWorkPlaceCode())
// .eq(IoSplitFifoCodeEntity::getBatchNo, splitFifoInv.getBatchNo())
.eq(IoSplitFifoCodeEntity::getRelId, splitFifoInv.getRelId()));
if (splitFifoCodeEntity == null) {
throw new JsonException("该工位不存在，请检查后重试！");
@ -207,7 +205,6 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
if (!b) {
throw new JsonException(500, "追溯码库存删减失败");
}
// IoSplitFifoInv splitFifoInv = addInvDesDetaiRequest.getSplitFifoInv();
IoSplitDesOrderDetail splitDesOrderDetail = IoSplitDesOrderDetail.builder()
.id(IdUtil.getSnowflakeNextId())
.workPlaceCode(collectOrder.getWorkPlaceCode())

1
src/main/java/com/glxp/api/service/collect/SysOrderLedService.java
Unescape Escape View File

@ -56,6 +56,5 @@ public class SysOrderLedService extends ServiceImpl<SysOrderLedMapper, SysOrderL
if (queueCount == 0){
updateSetOrderId(orderLed.getId());
}
// return ResultVOUtils.success();
}
}

2
src/main/java/com/glxp/api/service/dev/DeviceCheckDetailItemService.java
Unescape Escape View File

@ -27,5 +27,5 @@ public interface DeviceCheckDetailItemService extends IService<DeviceCheckDetail
void finish(DeviceCheckDetailItemFinishParam param, AuthAdmin user);
public void finishAll(DeviceCheckDetailParam param, AuthAdmin user);
void finishAll(DeviceCheckDetailParam param, AuthAdmin user);
}

2
src/main/java/com/glxp/api/service/dev/DeviceInfoService.java
Unescape Escape View File

@ -94,8 +94,6 @@ public interface DeviceInfoService extends IService<DeviceInfoEntity> {
List<DeviceInfoVo> detail(DeviceInfoDetailByDeptCodeQuery query);
List<DeviceInfoVo> listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status);
List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, List<DeviceStatusEnum> status);
boolean exitOrder(Long orderId, String deviceCode);

16
src/main/java/com/glxp/api/service/dev/DeviceInspectOrderService.java
Unescape Escape View File

@ -62,20 +62,4 @@ public interface DeviceInspectOrderService {
*/
BaseResponse deleteOrder(String id);
/**
* 根据报修单号生成新的维保单
*
* @param repairOrderId
* @return
*/
BaseResponse addByRepairOrderId(String repairOrderId);
/**
* 根据巡检计划单号生成新的维保单
*
* @param planOrderId
* @return
*/
BaseResponse addByPlanOrderId(String planOrderId);
}

1
src/main/java/com/glxp/api/service/dev/DeviceInspectPlanService.java
Unescape Escape View File

@ -63,7 +63,6 @@ public interface DeviceInspectPlanService {
*/
BaseResponse deletePlan(String id);
void genTaskDev(DeviceInspectPlanEntity deviceInspectPlanEntity);
}

6
src/main/java/com/glxp/api/service/dev/DeviceInspectTaskService.java
Unescape Escape View File

@ -29,12 +29,6 @@ public class DeviceInspectTaskService extends ServiceImpl<DeviceInspectTaskMappe
return true;
}
public Boolean delectDeviceInspectTask(DeviceInspectTaskEntity deviceInspectTaskEntity) {
deviceInspectTaskMapper.deleteById(deviceInspectTaskEntity);
return true;
}
public List<DeviceInspectTakeResponse> filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest) {
if (null == filterDeviceInspectTakeRequest) {
return Collections.emptyList();

2
src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class DeviceProjectSetService extends ServiceImpl<DeviceProjectSetMapper,
}
public boolean chcekCode(String code, String id) {
List<DeviceProjectSet> list = null;
List<DeviceProjectSet> list ;
if (id != null && !"".equals(id)) {
list = deviceProjectSetMapper.selectList(new QueryWrapper<DeviceProjectSet>().eq("code", code).ne("id", id));
} else

1
src/main/java/com/glxp/api/service/dev/DeviceReceiveOrderDetailService.java
Unescape Escape View File

@ -53,7 +53,6 @@ public interface DeviceReceiveOrderDetailService {
*/
BaseResponse checkCode(String code);
List<DeviceReceiveOrderDetailResponse> selectByorderIdFk(FilterDeviceReceiveOrderDetailRequest detailRequest);

2
src/main/java/com/glxp/api/service/dev/DeviceRepairOrderDetailService.java
Unescape Escape View File

@ -13,8 +13,6 @@ public interface DeviceRepairOrderDetailService extends IService<DeviceRepairOrd
List<DeviceRepairOrderDetailEntity> filterByorderIdFk(String orderIdFk);
boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity);
boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity);

8
src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailService.java
Unescape Escape View File

@ -12,16 +12,8 @@ import java.util.List;
* 针对表【device_upkeep_detail(保养任务明细)】的数据库操作Service
*/
public interface DeviceUpkeepDetailService extends IService<DeviceUpkeepDetailEntity> {
List<DeviceUpkeepDetailEntity> pageList(DeviceUpkeepDetailQuery query);
List<DeviceUpkeepDetailEntity> listByTaskId(Long taskId, String deviceCode);
DeviceUpkeepDetailEntity getOne(Long taskId, String deviceCode);
void finishItem(Long taskId, String deviceCode, String deptCode, Boolean normalFlag, AuthAdmin user);
}

12
src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java
Unescape Escape View File

@ -23,22 +23,10 @@ public interface DeviceUpkeepService extends IService<DeviceUpkeepEntity> {
void genByPlanId(Long planId, boolean b, AuthAdmin user);
DeviceUpkeepPrintVo checkInfoPrint(Long taskId, String deviceCode);
void finishUpkeep(Long taskId, String deviceCode);
List<DeviceUpkeepDetailVo> pageListDetail(DeviceUpkeepQuery query);
/**
* 完成一个保养设备
*
* @param taskId 任务id
* @param deviceCode 设备编码
* @return
*/
// void finishDevice(Long taskId, String deviceCode);
// void finishUpkeep(String deviceCode, String deptCode, Long taskId, AuthAdmin user);
}

4
src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java
Unescape Escape View File

@ -55,8 +55,6 @@ public class DeptDeviceDetailServiceImpl implements DeptDeviceDetailService {
FilterDeviceReceiveOrderDetailRequest detailRequest = new FilterDeviceReceiveOrderDetailRequest();
detailRequest.setOrderIdFk(orderId);
List<DeviceReceiveOrderDetailResponse> deviceReceiveOrderDetailResponses = deviceReceiveOrderDetailDao.filterList(detailRequest);
Date date = new Date();
for (DeviceReceiveOrderDetailResponse receiveOrderDetailResponse : deviceReceiveOrderDetailResponses) {
//查询此编码的产品是否已经在科室设备明细中
Long count = deptDeviceDetailDao.selectCount(new QueryWrapper<DeptDeviceDetailEntity>().eq("deptCode", receiveOrderEntity.getFromDeptCode())
@ -85,8 +83,6 @@ public class DeptDeviceDetailServiceImpl implements DeptDeviceDetailService {
deviceDetail.setStatus(DeviceStatus.DEVICE_STATUS_NORMAL);
deviceDetail.setAddType(1);
deviceDetail.setCreateUser(receiveOrderEntity.getAuditUser());
// deviceDetail.setCreateTime(date);
// deviceDetail.setUpdateTime(date);
deptDeviceDetailDao.insert(deviceDetail);
}else{
DeptDeviceDetailEntity deptDeviceDetailEntity = deptDeviceDetailDao.selectOne(new QueryWrapper<DeptDeviceDetailEntity>().eq("deptCode", receiveOrderEntity.getFromDeptCode()));

23
src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java
Unescape Escape View File

@ -143,19 +143,6 @@ public class DeviceChangeOrderServiceImpl extends ServiceImpl<DeviceChangeOrderM
Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
orderItems.forEach(i -> {
if (order.getType() == DeviceChangeTypeEnum.ADD) {
// UdiRelevanceResponse productInfo = udiRelevanceService.selectByRelId(i.getProductId().toString());
// if (productInfo == null) {
// throw new JsonException(String.format("未找到设备 %s", i.getProductName()));
// }
// i.setNameCode(productInfo.getNameCode())
// .setProductName(productInfo.getCpmctymc())
// .setGgxh(productInfo.getGgxh())
// .setMeasname(productInfo.getMeasname())
// .setManufactory(productInfo.getManufactory())
// .setZczbhhzbapzbh(productInfo.getZczbhhzbapzbh())
// .setSupId(productInfo.getUnitFk())
// .setSupName(productInfo.getSupName())
// ;
DeviceInfoEntity deviceInfoEntity = BeanUtil.copyProperties(i, DeviceInfoEntity.class);
deviceInfoEntity.setCheckLock(false);
deviceInfoEntity.setCreateUserId(order.getCreateUser());
@ -165,15 +152,7 @@ public class DeviceChangeOrderServiceImpl extends ServiceImpl<DeviceChangeOrderM
deviceInfoEntity.setStatus(DeviceStatusEnum.NORMAL);
deviceInfoEntity.setLastChangeOrderId(order.getOrderId());
deviceInfoEntity.setUpdateTime(LocalDateTime.now());
// boolean b = deviceInfoService.exitOrder(order.getOrderId(), deviceInfoEntity.getDeviceCode());
// if (b) {
// throw new JsonException(500, String.format("设备编码%s已存在，请更换编码", deviceInfoEntity.getDeviceCode()));
// }
// try {
deviceInfoService.saveOrUpdate(deviceInfoEntity);
// } catch (Exception e) {
// throw new JsonException(500, String.format("设备编码%s已存在，请更换编码", deviceInfoEntity.getDeviceCode()));
// }
deviceInfoService.saveOrUpdate(deviceInfoEntity);
DeviceChangeLogEntity logEntity = DeviceChangeLogEntity.genEntity(i.getDeviceCode(), orderVo);
logs.add(logEntity);
} else if (order.getType() == DeviceChangeTypeEnum.CHANGE){

3
src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java
Unescape Escape View File

@ -158,9 +158,6 @@ public class DeviceCheckServiceImpl extends ServiceImpl<DeviceCheckMapper, Devic
PageHelper.startPage(query.getPage(), query.getLimit());
}
List<DeviceCheckVo> list = super.baseMapper.pageVo(query);
// List<DeviceCheckEntity> list = super.list(Wrappers.lambdaQuery(DeviceCheckEntity.class)
// .orderByAsc(DeviceCheckEntity::getCreateTime)
// );
return list;
}

13
src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java
Unescape Escape View File

@ -53,11 +53,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
@Transactional
public void changeStatus(String deviceCode, String deptCode, DeviceStatusEnum oldStatus, DeviceStatusEnum toStatus) throws JsonException {
boolean isFinishRepair = oldStatus == DeviceStatusEnum.REPAIR && toStatus == DeviceStatusEnum.NORMAL;
// boolean isFinishCheck = oldStatus == DeviceStatusEnum.CHECK;
boolean isRepairApply = toStatus == DeviceStatusEnum.REPAIR_APPLY;
boolean updated = super.update(Wrappers.lambdaUpdate(DeviceInfoEntity.class)
.setSql(isFinishRepair, "repairCount = repairCount +1")
// .setSql(isFinishCheck, "checkCount = checkCount +1")
.setSql(isRepairApply, "repairApplyCount = repairApplyCount +1")
.set(DeviceInfoEntity::getStatus, toStatus)
.set(DeviceInfoEntity::getUpdateTime,LocalDateTime.now())
@ -178,17 +176,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
return super.baseMapper.detail(query);
}
@Override
public List<DeviceInfoVo> listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status) {
List<DeviceInfoVo> list = super.baseMapper.listVoByProductIdAndStatus(productId, status);
// List<DeviceInfoEntity> list = super.list(Wrappers.lambdaQuery(DeviceInfoEntity.class)
// .eq(DeviceInfoEntity::getProductId, productId)
// .eq(DeviceInfoEntity::getStatus, status)
// );
return list;
}
@Override
public List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, List<DeviceStatusEnum> status) {

42
src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java
Unescape Escape View File

@ -117,46 +117,4 @@ public class DeviceInspectOrderServiceImpl implements DeviceInspectOrderService
deviceInspectOrderDao.deleteById(id);
return ResultVOUtils.success();
}
@Override
public BaseResponse addByRepairOrderId(String repairOrderId) {
//查询报修单信息
DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(repairOrderId);
DeviceInspectOrderEntity orderEntity = new DeviceInspectOrderEntity();
String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_ORDER, "yyyyMMdd"));
orderEntity.setOrderId(orderId);
orderEntity.setCode(deviceRepairOrderEntity.getCode());
orderEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode());
orderEntity.setInvCode(deviceRepairOrderEntity.getInvCode());
orderEntity.setStatus(0); //状态：新增
orderEntity.setType(1); //维保类型：报修
orderEntity.setDeviceStatus(1); //设备状态：正常
orderEntity.setLastOrderId(repairOrderId);
orderEntity.setCreateTime(new Date());
orderEntity.setUpdateTime(new Date());
orderEntity.setCreateUser(customerService.getUserIdStr());
deviceInspectOrderDao.insert(orderEntity);
return ResultVOUtils.success();
}
@Override
public BaseResponse addByPlanOrderId(String planOrderId) {
//查询报修单信息
DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(planOrderId);
DeviceInspectOrderEntity orderEntity = new DeviceInspectOrderEntity();
String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_ORDER, "yyyyMMdd"));
orderEntity.setOrderId(orderId);
orderEntity.setCode(deviceInspectPlanEntity.getCode());
orderEntity.setDeptCode(deviceInspectPlanEntity.getDeptCode());
orderEntity.setInvCode(deviceInspectPlanEntity.getInvCode());
orderEntity.setStatus(0); //状态：新增
orderEntity.setType(2); //维保类型：计划
orderEntity.setDeviceStatus(1); //设备状态：正常
orderEntity.setLastOrderId(planOrderId);
orderEntity.setCreateTime(new Date());
orderEntity.setUpdateTime(new Date());
orderEntity.setCreateUser(customerService.getUserIdStr());
deviceInspectOrderDao.insert(orderEntity);
return ResultVOUtils.success();
}
}

2
src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java
Unescape Escape View File

@ -48,8 +48,6 @@ public class DeviceInspectPlanServiceImpl implements DeviceInspectPlanService {
@Resource
private GennerOrderUtils gennerOrderUtils;
@Resource
private DeviceInspectOrderService deviceInspectOrderService;
@Resource
private DeviceInspectTaskService deviceInspectTaskService;
@Resource
private DeviceInspectPlanDelectMapper deviceInspectPlanDelectMapper;

4
src/main/java/com/glxp/api/service/dev/impl/DevicePlanServiceImpl.java
Unescape Escape View File

@ -33,10 +33,6 @@ public class DevicePlanServiceImpl extends ServiceImpl<DevicePlanMapper, DeviceP
public List<DevicePlanVo> pageList(DevicePlanQuery query) {
PageHelper.startPage(query.getPage(), query.getLimit());
List<DevicePlanVo> list =super.baseMapper.pageVo(query);
// List<DevicePlanVo> list = super.list(Wrappers.lambdaQuery(DevicePlanEntity.class)
// .like(StrUtil.isNotBlank(query.getName()), DevicePlanEntity::getName, query.getName())
// .orderByDesc(DevicePlanEntity::getStartDate)
// );
return list;
}

15
src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java
Unescape Escape View File

@ -43,8 +43,6 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
@Resource
private InvProductNewDao invProductNewDao;
@Resource
private InvProductDao invProductDao;
@Resource
private SystemParamConfigService systemParamConfigService;
@Resource
private UdiProductService udiProductService;
@ -125,18 +123,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
}
} else {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("device_product");
if (systemParamConfigEntity.getParamValue().equals("0") || addDetailRequest.getType() == 1) {
//TODO 20241017 这个插入设备领用记录详情需要依赖订单详情表先注释了看下要不要用其他方式写
// //通过选库存添加
// //查询选中的库存信息
// for (String invProductId : addDetailRequest.getInvProductIds()) {
// //查询库存详情
// InvProductNewVo invProductDetailEntities = invProductNewDao.selectById(Integer.valueOf(invProductId));
// DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), invProductDetailEntities.getCode(), invProductDetailEntities);
// //插入设备领用记录详情
// deviceReceiveOrderDetailDao.insert(orderDetail);
// }
} else if (systemParamConfigEntity.getParamValue().equals("1") || addDetailRequest.getType() == 3) {
if (systemParamConfigEntity.getParamValue().equals("1") || addDetailRequest.getType() == 3) {
for (String invProductId : addDetailRequest.getInvProductIds()) {
DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity();

4
src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java
Unescape Escape View File

@ -49,12 +49,8 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService {
@Resource
private GennerOrderUtils gennerOrderUtils;
@Resource
private DeviceInspectOrderService deviceInspectOrderService;
@Resource
private DeviceInspectTaskService deviceInspectTaskService;
@Resource
private DeviceInspectPlanDelectMapper deviceInspectPlanDelectMapper;
@Resource
private DeviceInspectTaskDetailService deviceInspectTaskDetailService;
@Resource
private DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper;

2
src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java
Unescape Escape View File

@ -104,7 +104,6 @@ public class DeviceUpkeepServiceImpl extends ServiceImpl<DeviceUpkeepMapper, Dev
.createUserId(b ? null : user.getId())
.createUserName(b ? null : user.getEmployeeName())
.build();
List<DeviceUpkeepDetailEntity> upkeepDetailList = new ArrayList<>();
List<DeviceUpkeepDetailItemEntity> upkeepDetailItemList = new ArrayList<>();
Map<String, List<DevicePlanDetailItemEntity>> finalItemMap = itemMap;
@ -136,7 +135,6 @@ public class DeviceUpkeepServiceImpl extends ServiceImpl<DeviceUpkeepMapper, Dev
.finishFlag(false)
.updateTime(LocalDateTime.now())
.build();
// deviceCheckDetailItem.setUpdateTime(LocalDateTime.now());
upkeepDetailItemList.add(deviceCheckDetailItem);
});
detailEntity.setItemCount(items.size());

74
src/main/java/com/glxp/api/service/dev/impl/InvMAOrderDetailServiceImpl.java
Unescape Escape View File

@ -131,82 +131,10 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
return ResultVOUtils.success();
}
//TODO 20241017 根据库存详情批量添加养护详情记录基本上逻辑就是依赖code先注释了
// 之前逻辑都被注释了 现在给他清空
@Override
public BaseResponse batchAddDetail(AddInvMAOrderDetailRequest addMAOrderDetailRequest) {
return null;
// //查询库存养护记录说明
// InvMAExplanationEntity invMAExplanationEntity = invMAExplanationDao.selectByStatus(1);
// //遍历库存ID，查找库存详情的条码信息，生成库存养护记录详情
// addMAOrderDetailRequest.getInvProductIds().forEach(invProductId -> {
// //查询库存信息
// InvProductEntity invProductEntity = invProductDao.selectById(invProductId);
// //查询库存详情码信息
// FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest();
// detailRequest.setRelId(String.valueOf(invProductEntity.getRelIdFk()));
// detailRequest.setBatchNo(invProductEntity.getBatchNo());
// detailRequest.setDeptCode(invProductEntity.getDeptCode());
// detailRequest.setInvCode(invProductEntity.getInvCode());
// detailRequest.setProductionDate(invProductEntity.getProductionDate());
// detailRequest.setExpireDate(invProductEntity.getExpireDate());
// List<InvProductNewVo> invProductDetailEntities = invProductNewDao.filterInvProductDetailList(detailRequest);
// //提取去重后的码集合
// List<String> codeList = invProductDetailEntities.stream().map(InvProductNewVo::getCode).distinct().collect(Collectors.toList());
// //初始化码数量计算集合数据
// Map<String, Integer> codeMap = new HashMap<>(codeList.size());
// codeList.forEach(code -> codeMap.put(code, 0));
// //计算当前在库存中的码明细
// for (InvProductNewVo invProductDetailEntity : invProductDetailEntities) {
// UdiEntity udi = FilterUdiUtils.getUdi(invProductDetailEntity.getCode());
// if (StrUtil.isNotBlank(udi.getSerialNo())) {
// //有序列号产品，根据产品数量计算即可
// Integer count = codeMap.get(invProductDetailEntity.getCode());
// if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
// //出库
// count = count - 1;
// } else {
// //入库
// count = count + 1;
// }
// codeMap.put(invProductDetailEntity.getCode(), count);
// } else {
// //无序列号产品条码，直接查询库存，使用此库存信息计算出养护数量
// int count = invProductEntity.getInCount() - invProductEntity.getOutCount();
// codeMap.put(invProductDetailEntity.getCode(), count);
// }
// }
//
// //根据库存中的码明细，生成库存养护记录详情
// for (String code : codeMap.keySet()) {
// if (codeMap.get(code) > 0) {
// //获取库存详情
// InvProductNewVo invProductDetailEntity = null;
// for (InvProductNewVo detailEntity : invProductDetailEntities) {
// if (detailEntity.getCode().equals(code)) {
// invProductDetailEntity = detailEntity;
// break;
// }
// }
// //生成库存养护记录详情
// InvMAOrderDetailEntity maOrderDetail = new InvMAOrderDetailEntity();
// maOrderDetail.setOrderIdFk(addMAOrderDetailRequest.getOrderIdFk());
// maOrderDetail.setCode(invProductDetailEntity.getCode());
// maOrderDetail.setRelId(invProductDetailEntity.getRelId());
// maOrderDetail.setNameCode(invProductDetailEntity.getNameCode());
// maOrderDetail.setProductionDate(invProductDetailEntity.getProduceDate());
// maOrderDetail.setExpireDate(invProductDetailEntity.getExpireDate());
// maOrderDetail.setBatchNo(invProductDetailEntity.getBatchNo());
// maOrderDetail.setCount(codeMap.get(code));
// maOrderDetail.setMaStatus(0);
// maOrderDetail.setDeviceStatus(1);
// maOrderDetail.setCreateTime(new Date());
// if (null != invMAExplanationEntity) {
// maOrderDetail.setRemark(invMAExplanationEntity.getText());
// }
// invMAOrderDetailDao.insert(maOrderDetail);
// }
// }
// });
// return ResultVOUtils.success("添加成功");
}
@Override

1
src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java
Unescape Escape View File

@ -119,7 +119,6 @@ public class ForThirdSysApiService {
orderEntity.setUpdateTime(new Date());
orderEntity.setCustomerId("110");
orderEntity.setDeptCode(orderRequest.getDeptCode());
// orderEntity.setCheckPreInOrders(addOrderRequest.getCheckPreInOrders());
orderEntity.setInvCode(orderRequest.getInvCode());
orderEntity.setOrderType(orderRequest.getOrderType());
orderEntity.setBusType(bussinessTypeEntity.getBusType());

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

@ -741,12 +741,6 @@ public class IoAddInoutService {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
orderService.update(orderEntity);
ioCheckInoutService.checkCodeResult(orderEntity.getBillNo());
// if (checkWebNewType == 0) {
//
// } else {
// dealProcess(orderEntity);
// ioCheckInoutService.checkRightResult(orderEntity.getBillNo());
// }
return ResultVOUtils.success("提交成功！");
}
@ -788,82 +782,6 @@ public class IoAddInoutService {
return null;
}
public String checkInvExitSup(IoCodeEntity codeEnttity) {
String supId = checkNorInv(codeEnttity);
if (supId == null) {
return checkPreInv(codeEnttity);
}
return supId;
}
//查普通库存 todo
public String checkNorInv(IoCodeEntity codeEnttity) {
// FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
// filterInvWarehouseRequest.setLevel(1);
// filterInvWarehouseRequest.setAdvanceType(false);
// List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
// List<String> codes = new ArrayList<>();
// if (!invWarehouseEntities.isEmpty()) {
// for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
// codes.add(invWarehouseEntity.getCode());
// }
// }
// FilterInvProductRequest filterInvProductDetailRequest = new FilterInvProductRequest();
// filterInvProductDetailRequest.setRelIdFk(codeEnttity.getRelId());
// filterInvProductDetailRequest.setBatchNo(codeEnttity.getBatchNo());
// filterInvProductDetailRequest.setInvCodes(codes);
// List<InvProductEntity> invProductEntities = invProductService.filterInvProduct(filterInvProductDetailRequest);
// if (invProductEntities.size() > 0) {
// String supId = invProductEntities.get(0).getSupId();
// int count = 0;
// for (InvProductEntity invProductEntity : invProductEntities) {
// if (!supId.equals(invProductEntity.getSupId())) {
// return null;
// }
// count = count + (invProductEntity.getInCount() - invProductEntity.getOutCount());
// }
// if (count > 0)
// return supId;
// }
return null;
}
//查寄售库存 todo
public String checkPreInv(IoCodeEntity codeEnttity) {
// FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
// filterInvWarehouseRequest.setLevel(1);
// filterInvWarehouseRequest.setAdvanceType(true);
// List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
// List<String> codes = new ArrayList<>();
// if (!invWarehouseEntities.isEmpty()) {
// for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
// codes.add(invWarehouseEntity.getCode());
// }
// }
// FilterInvProductRequest filterInvProductDetailRequest = new FilterInvProductRequest();
// filterInvProductDetailRequest.setRelIdFk(codeEnttity.getRelId());
// filterInvProductDetailRequest.setBatchNo(codeEnttity.getBatchNo());
// filterInvProductDetailRequest.setInvCodes(codes);
// List<InvProductEntity> invProductEntities = invPreProductService.filterInvProduct(filterInvProductDetailRequest);
// if (invProductEntities.size() > 0) {
// String supId = invProductEntities.get(0).getSupId();
// int count = 0;
// for (InvProductEntity invProductEntity : invProductEntities) {
// if (!supId.equals(invProductEntity.getSupId())) {
// return null;
// }
// count = count + (invProductEntity.getInCount() - invProductEntity.getOutCount());
// }
// if (count > 0)
// return supId;
// }
return null;
}
//查询本单是否有重复条码
public String checkOrderRepeatCode(IoCodeTempEntity codeEntity, List<IoCodeTempEntity> filterList) {
int count = 0;

19
src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java
Unescape Escape View File

@ -72,13 +72,6 @@ public class IoChangeInoutService {
//结束，不生成库存，
}
//后续做修改
public void changeBusOrder(IoOrderEntity orderEntity) {
}
//普通出入库单据流转
public void genNewOrder(IoOrderEntity orderEntity) {
@ -208,7 +201,6 @@ public class IoChangeInoutService {
} else {
// 原先单据流程
filterSupMaps.put("test", useInList);
// filterSupMaps.put(bussinessChangeTypeEntity.getDefaultInvCode(), useInList);
}
//根据往来单位生成入库单
for (String corpName : filterSupMaps.keySet()) {
@ -258,9 +250,6 @@ public class IoChangeInoutService {
outOrder.setCustomerId(corpName);
outOrder.setFromCorp(corpName);
}
//原先流程---使用流转单据默认仓库
// outOrder.setFromInvCode(bussinessChangeTypeEntity.getDefaultInvCode());
// outOrder.setFromDeptCode(bussinessChangeTypeEntity.getDefaultDeptCode());
} else { //向上级补单模式
outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
@ -276,17 +265,9 @@ public class IoChangeInoutService {
InvWarehouseEntity fromInv = invWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getDefaultInvCode());
outOrder.setFromDeptCode(fromInv.getParentId());
}
//原先流程---使用流转单据默认仓库
// outOrder.setFromInvCode(bussinessChangeTypeEntity.getDefaultInvCode());
// outOrder.setFromDeptCode(bussinessChangeTypeEntity.getDefaultDeptCode());
outOrder.setFromCorp(null);
}
outOrder.setCorpOrderId(CustomUtil.getId() + "x");
//原先流程---使用流转单据默认仓库
// InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getInvCode());
// outOrder.setInvCode(invWarehouseEntity.getCode());
// outOrder.setDeptCode(invWarehouseEntity.getParentId());
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode());
outOrder.setInvCode(invWarehouseEntity.getCode());
outOrder.setDeptCode(invWarehouseEntity.getParentId());

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

@ -412,45 +412,6 @@ public class IoCheckInoutService {
@Resource
BasicSkPrescribeDiService basicSkPrescribeDiService;
/**
* 单据类型是否校验处方(边扫边校验）
*/
public String checkPrescribeDi(IoCodeTempEntity codeEntity, String adNum) {
BasicSkPrescribeDiEntity basicSkPrescribeDiEntity = basicSkPrescribeDiService.findByRelId(adNum, codeEntity.getRelId());
IoOrderDetailCodeEntity orderDetailCodeEntity = orderDetailCodeService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo(), codeEntity.getPrice());
int curCount = 0;
if (orderDetailCodeEntity != null) {
curCount = orderDetailCodeEntity.getReCount() + codeEntity.getMyReCount();
} else {
curCount = codeEntity.getMyReCount();
}
if (curCount > IntUtil.value(basicSkPrescribeDiEntity.getCount())) {
return "当前产品数量超出！";
}
return null;
}
@Resource
IoOrderSkPrescribeService orderSkPrescribeService;
/**
* 单据提交后，保存处方校验结果
*/
public void checkUploadPrescribe(IoOrderEntity orderEntity) {
List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderEntity.getBillNo());
List<BasicSkPrescribeDiResponse> basicSkPrescribeDiResponses = checkPrescirbe(orderDetailCodeEntities, orderEntity);
orderSkPrescribeService.remove(new QueryWrapper<IoOrderSkPrescribeEntity>().eq("orderIdFk", orderEntity.getBillNo()));
if (CollUtil.isNotEmpty(basicSkPrescribeDiResponses)) {
for (BasicSkPrescribeDiResponse basicSkPrescribeDiResponse : basicSkPrescribeDiResponses) {
IoOrderSkPrescribeEntity orderSkPrescribeEntity = new IoOrderSkPrescribeEntity();
BeanUtils.copyProperties(basicSkPrescribeDiResponse, orderSkPrescribeEntity);
orderSkPrescribeEntity.setOrderIdFk(orderEntity.getBillNo());
orderSkPrescribeService.save(orderSkPrescribeEntity);
}
}
}
/**
* 单据类型是否校验处方(单据提交时校验）
@ -738,7 +699,6 @@ public class IoCheckInoutService {
}
//更新扫码详情表
orderDetailCodeDao.updateBatchById(orderDetailCodeEntities);
// orderDetailCodeService.update()
codeTempService.deleteByBillNo(orderEntity.getBillNo());
orderEntity.setErrMsg("校验成功！");
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
@ -1193,8 +1153,6 @@ public class IoCheckInoutService {
IoChangeInoutService changeInoutService;
@Resource
InvPreinProductDetailService invPreinProductDetailService;
@Resource
UdiCalCountUtil udiCalCountUtil;
//校验完成后生成库存
public void genInv(IoOrderEntity orderEntity, BasicBussinessTypeEntity bussinessTypeEntity) {

5
src/main/java/com/glxp/api/service/inout/IoCheckInvService.java
Unescape Escape View File

@ -117,7 +117,6 @@ public class IoCheckInvService {
return ResultVOUtils.error(500, "当前库存不足");
}
}
} else {
int exitCount = IntUtil.value(codeTempService.selectExitCount(codeTempEntity.getOrderId(), codeTempEntity.getBatchNo(), codeTempEntity.getRelId(), codeTempEntity.getSupId()));
if (isEdit) {
@ -190,10 +189,6 @@ public class IoCheckInvService {
} else
return ResultVOUtils.error(500, "预验收库存数量不足！");
} else {
// if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo())
// && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) {
// return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
// }
if (StrUtil.isNotEmpty(codeTempEntity.getOrderId())) {//非首次添加
if (StrUtil.isEmpty(codeTempEntity.getSerialNo())) {//该单据已有该产品
//无序列号，则可能存在多个预验收入库单

11
src/main/java/com/glxp/api/service/inout/IoCodeTempService.java
Unescape Escape View File

@ -319,10 +319,6 @@ public class IoCodeTempService {
PageSimpleResponse<IoCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(pageInfo.getList());
// ArrayList<IoCodeTempResponse> ioCodeTempResponses = new ArrayList<>();
// ioCodeTempResponses.addAll(ioCodeResponses.stream()
// .map(ioCodeResponse -> convertToIoCodeTempResponse(ioCodeResponse))
// .collect(Collectors.toList()));
return ResultVOUtils.success(pageSimpleResponse);
}
@ -343,11 +339,4 @@ public class IoCodeTempService {
.eq(IoCodeTempEntity::getGroupNumber,groupNumber)
);
}
// public IoCodeTempResponse convertToIoCodeTempResponse(IoCodeResponse response) {
// IoCodeTempResponse tempResponse = new IoCodeTempResponse();
// BeanUtils.copyProperties(response,tempResponse);
// return tempResponse;
// }
}

119
src/main/java/com/glxp/api/service/inout/IoGenInvService.java
Unescape Escape View File

@ -131,65 +131,6 @@ public class IoGenInvService {
}
//生成用户普通库存
public void genNorInvUser(String orderId) {
IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
List<IoOrderDetailResultEntity> orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId);
List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderId);
//生成库存产品表
for (IoOrderDetailResultEntity orderDetailResultEntity : orderDetailResultEntities) {
InvUserProductEntity invUserProductEntity = invUserProductService.selectByUnique(orderDetailResultEntity.getBindRlFk(), orderDetailResultEntity.getBatchNo(), orderDetailResultEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode(), orderEntity.getCreateUser(), ConstantStatus.ACTION_TYPE_NORMAL);
if (invUserProductEntity == null) {
invUserProductEntity = new InvUserProductEntity();
invUserProductEntity.setRelIdFk(orderDetailResultEntity.getBindRlFk());
invUserProductEntity.setNameCode(orderDetailResultEntity.getNameCode());
invUserProductEntity.setBatchNo(orderDetailResultEntity.getBatchNo());
invUserProductEntity.setProductionDate(orderDetailResultEntity.getProductDate());
invUserProductEntity.setExpireDate(orderDetailResultEntity.getExpireDate());
invUserProductEntity.setInCount(0);
invUserProductEntity.setType(ConstantStatus.ACTION_TYPE_NORMAL);
invUserProductEntity.setOutCount(0);
invUserProductEntity.setSupId(orderDetailResultEntity.getSupId());
invUserProductEntity.setDeptCode(orderEntity.getDeptCode());
invUserProductEntity.setInvCode(orderEntity.getInvCode());
invUserProductEntity.setCreateTime(new Date());
invUserProductEntity.setUpdateTime(new Date());
invUserProductService.addInvUserProduct(invUserProductEntity);
}
if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
invUserProductEntity.setOutCount(invUserProductEntity.getOutCount() + orderDetailResultEntity.getReCount());
} else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
invUserProductEntity.setInCount(invUserProductEntity.getInCount() + orderDetailResultEntity.getReCount());
}
invUserProductEntity.setReCount(invUserProductEntity.getInCount() - invUserProductEntity.getOutCount());
invUserProductEntity.setUpdateTime(new Date());
invUserProductService.updateInvUserProduct(invUserProductEntity);
}
//生成库存码详情
List<InvUserProductDetailEntity> invUserProductDetailEntityList = new ArrayList<>();
for (IoCodeEntity codeEntity : codeEnttities) {
InvUserProductDetailEntity invUserProductDetailEntity = new InvUserProductDetailEntity();
BeanUtils.copyProperties(codeEntity, invUserProductDetailEntity);
invUserProductDetailEntity.setRelId(codeEntity.getRelId());
invUserProductDetailEntity.setUpdateTime(new Date());
invUserProductDetailEntity.setId(null);
invUserProductDetailEntity.setInvSpaceCode(codeEntity.getWarehouseCode());
invUserProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
if (invUserProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
invUserProductDetailEntity.setInCount(invUserProductDetailEntity.getReCount());
} else if (invUserProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
invUserProductDetailEntity.setOutCount(invUserProductDetailEntity.getReCount());
}
invUserProductDetailEntityList.add(invUserProductDetailEntity);
}
invUserProductDetailService.addInvUserProductDetailList(invUserProductDetailEntityList);
}
@Resource
InvPreProductService invPreProductService;
@Resource
@ -406,66 +347,6 @@ public class IoGenInvService {
}
//生成用户预验收库存
public void genUserPreInInv(String orderId) {
IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
List<IoOrderDetailResultEntity> orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId);
List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderId);
//生成库存产品表
for (IoOrderDetailResultEntity orderDetailResultEntity : orderDetailResultEntities) {
InvUserProductEntity invUserProductEntity = invUserProductService.selectByUnique(orderDetailResultEntity.getBindRlFk(), orderDetailResultEntity.getBatchNo(), orderDetailResultEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode(), orderEntity.getCreateUser(), ConstantStatus.ACTION_TYPE_ADVANCE);
if (invUserProductEntity == null) {
invUserProductEntity = new InvUserProductEntity();
invUserProductEntity.setRelIdFk(orderDetailResultEntity.getBindRlFk());
invUserProductEntity.setNameCode(orderDetailResultEntity.getNameCode());
invUserProductEntity.setBatchNo(orderDetailResultEntity.getBatchNo());
invUserProductEntity.setProductionDate(orderDetailResultEntity.getProductDate());
invUserProductEntity.setExpireDate(orderDetailResultEntity.getExpireDate());
invUserProductEntity.setInCount(0);
invUserProductEntity.setType(ConstantStatus.ACTION_TYPE_ADVANCE);
invUserProductEntity.setOutCount(0);
invUserProductEntity.setSupId(orderDetailResultEntity.getSupId());
invUserProductEntity.setDeptCode(orderEntity.getDeptCode());
invUserProductEntity.setInvCode(orderEntity.getInvCode());
invUserProductEntity.setCreateTime(new Date());
invUserProductEntity.setUpdateTime(new Date());
invUserProductService.addInvUserProduct(invUserProductEntity);
}
if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
invUserProductEntity.setOutCount(invUserProductEntity.getOutCount() + orderDetailResultEntity.getReCount());
} else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
invUserProductEntity.setInCount(invUserProductEntity.getInCount() + orderDetailResultEntity.getReCount());
}
invUserProductEntity.setReCount(invUserProductEntity.getInCount() - invUserProductEntity.getOutCount());
invUserProductEntity.setUpdateTime(new Date());
invUserProductService.updateInvUserProduct(invUserProductEntity);
}
//生成库存码详情
List<InvUserProductDetailEntity> invUserProductDetailEntityList = new ArrayList<>();
for (IoCodeEntity codeEntity : codeEnttities) {
InvUserProductDetailEntity invUserProductDetailEntity = new InvUserProductDetailEntity();
BeanUtils.copyProperties(codeEntity, invUserProductDetailEntity);
invUserProductDetailEntity.setRelId(codeEntity.getRelId());
invUserProductDetailEntity.setUpdateTime(new Date());
invUserProductDetailEntity.setId(null);
invUserProductDetailEntity.setInvSpaceCode(codeEntity.getWarehouseCode());
invUserProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
if (invUserProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
invUserProductDetailEntity.setInCount(invUserProductDetailEntity.getReCount());
} else if (invUserProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
invUserProductDetailEntity.setOutCount(invUserProductDetailEntity.getReCount());
}
invUserProductDetailEntityList.add(invUserProductDetailEntity);
}
invUserProductDetailService.addInvUserProductDetailList(invUserProductDetailEntityList);
}
}

5
src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
Unescape Escape View File

@ -43,11 +43,6 @@ public interface IoOrderDetailBizService {
List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk);
List<IoOrderDetailBizEntity> checkOrderList(String orderId);
List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);

2
src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java
Unescape Escape View File

@ -41,7 +41,7 @@ public interface IoOrderDetailCodeService {
*/
int deleteByOrderId(String orderId);
public List<IoOrderDetailCodeEntity> checkOrderList(String orderId, String productName);
List<IoOrderDetailCodeEntity> checkOrderList(String orderId, String productName);
boolean isExit(String orderId);

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

@ -11,8 +11,4 @@ public interface IoOrderMutiSetService extends IService<IoOrderMutiSetEntity>{
List<IoOrderMutiSetResponse> filterList(IoOrderMutiSetRequest ioOrderMutiSetRequest);
}

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

@ -65,8 +65,6 @@ public interface IoOrderService {
*/
List<IoOrderResponse> filterList(FilterOrderRequest filterOrderRequest);
List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest);
List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest);
/**
@ -138,9 +136,6 @@ public interface IoOrderService {
*/
BaseResponse submitToThrSys(String billNo);
boolean isExitByAction(String action);
List<IoOrderEntity> findAllByAction(String action);
/**
@ -153,16 +148,11 @@ public interface IoOrderService {
List<IoOrderEntity> selectList(Long userId);
List<String> selectOrderIdList(@Param("data") String data);
void updateOrderInventory(String billNo, Integer status);
IoOrderEntity findCorpOrderId(String billNo);
IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long UserId);
String selectAliYljgSearchbillByAliBillNo(String key);
}

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

@ -268,7 +268,6 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
} else {
//队列码数量大于扫码数量更新数量（一般指无序列号）
// UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(collectOrderCodeMan.getRelId());
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
filterUdiRelRequest.setId(collectOrderCodeMan.getRelId());
filterUdiRelRequest.setPackLevel("1");

110
src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
Unescape Escape View File

@ -159,16 +159,6 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
);
}
public IoSplitFifoCodeEntity findByCodes(String code, List<Long> invIdFks) {
return splitFifoCodeMapper.selectOne(
new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
.eq(IoSplitFifoCodeEntity::getCode, code)
.in(IoSplitFifoCodeEntity::getInvIdFk, invIdFks)
.last("limit 1")
);
}
/**
* 库存量提醒
*
@ -338,92 +328,6 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
return true;
}
// /**
// * 预分配库存
// */
// @Transactional(rollbackFor = Exception.class)
// public void preAllotInv(Long workPaceCode) {
// if (workPaceCode == null || workPaceCode == 0l) return;
//
// //1. 查询出当前工位的未分配的库存
// IoSplitFifoCodeRequest splitFifoCodeRequest = new IoSplitFifoCodeRequest();
// splitFifoCodeRequest.setWorkPlaceCode(workPaceCode);
// List<IoSplitCodeResponse> ioSplitCodeResponses = this.baseMapper.filterGroupList(splitFifoCodeRequest);
// if (CollUtil.isEmpty(ioSplitCodeResponses)) return;
// Map<Long, List<IoSplitCodeResponse>> splitMap = ioSplitCodeResponses.stream().collect(Collectors.groupingBy(IoSplitCodeResponse::getRelId));
//
// //2.遍历当前工位待处理的单据，根据orderTime排序
// CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
// collectOrderRequest.setWorkPlaceCode(workPaceCode);
// collectOrderRequest.setTagStatus(1);
// List<IoCollectOrderResponse> orderList = collectOrderMapper.filterList(collectOrderRequest);
// if (CollUtil.isEmpty(orderList)) return;
//
// //3.为每个单据底下的单据详情分配数量
// for (int i = 0; i < orderList.size(); i++) {
// IoCollectOrderResponse order = orderList.get(i);
// CollectOrderBizRequest bizRequest = new CollectOrderBizRequest();
// bizRequest.setOrderIdFk(String.valueOf(order.getBillNo()));
// List<CollectOrderBizResponse> bizList = collectOrderBizMapper.filterList(bizRequest);
// if (CollUtil.isNotEmpty(bizList)) {
// //自动分配 工位存量、更新splitMap、更新 bizList上的 缺少存量数
// Integer invAlert = autoAllocationWorkPace(splitMap, bizList);
// collectOrderMapper.updateInvAlert(order.getId(), invAlert);
// }
// }
//
// }
// /**
// * 自动分配 工位存量、更新splitMap、更新 bizList上的 缺少存量数
// *
// * @param splitMap
// * @param bizList
// */
// @Transactional(rollbackFor = Exception.class)
// Integer autoAllocationWorkPace(Map<Long, List<IoSplitCodeResponse>> splitMap, List<CollectOrderBizResponse> bizList) {
// Integer invAlert = 1;
// for (int i = 0; i < bizList.size(); i++) {
// CollectOrderBizResponse collectOrderBizResponse = bizList.get(i);
// Long relId = collectOrderBizResponse.getRelId();
// String batchNo = collectOrderBizResponse.getBatchNo();
// Integer count = collectOrderBizResponse.getCount(); //当前明细 需要的数量
// Long bizId = collectOrderBizResponse.getId();
//
// List<IoSplitCodeResponse> ioSplitCodeResponses = splitMap.get(relId);
// List<IoSplitCodeResponse> newioSplitCodeResponses = new ArrayList<>(ioSplitCodeResponses.size());
//
// if (CollUtil.isNotEmpty(ioSplitCodeResponses)) {
// for (int j = 0; j < ioSplitCodeResponses.size(); j++) {
// IoSplitCodeResponse ioSplit = ioSplitCodeResponses.get(j);
// Integer totalCount = ioSplit.getTotalCount();
// if ((StrUtil.isBlank(batchNo) || batchNo.equals(ioSplit.getBatchNo())) && count > 0 && totalCount > 0) {
// Integer resCount = totalCount - count;//预分配后剩余 工位存量
// if (resCount >= 0) {//足够分配
// count = 0;
// ioSplit.setTotalCount(resCount);
// } else {//不够分配
// count = -resCount;
// ioSplit.setTotalCount(0);
// }
// }
// newioSplitCodeResponses.add(ioSplit);
// }
//
// splitMap.put(relId, newioSplitCodeResponses);
// }
//
// if (count > 0) {//不够分配
// collectOrderBizMapper.updateAutoResCount(bizId, -count);
// invAlert = 2;
// } else {
// collectOrderBizMapper.updateAutoResCount(bizId, collectOrderBizResponse.getCount());
// }
// }
//
// return invAlert;
// }
@Transactional(rollbackFor = Exception.class)
Integer autoAllocationBillNoInv(Map<Long, List<IoSplitInvResponse>> splitMap, List<CollectOrderBizResponse> bizList) {
Integer invAlert = 1;
@ -537,20 +441,6 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
}
}
}
public IoSplitFifoCodeEntity findByQueueCode(String code) {
return getOne(new LambdaQueryWrapper<IoSplitFifoCodeEntity>().eq(IoSplitFifoCodeEntity::getWorkPlaceQueueCode, code).last("limit 1"));
}
//判断当前工位底下是否有其他产品
public List<IoSplitFifoCodeEntity> findByRelId(Long workPlaceCode, Long relId) {
return list(new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
.eq(IoSplitFifoCodeEntity::getWorkPlaceCode, workPlaceCode)
.eq(IoSplitFifoCodeEntity::getRelId, relId)
.last("limit 1"));
}
public List<String> getCodeList(String workPlaceQueueCode) {
List<IoSplitFifoCodeEntity> list = this.list(new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
.select(IoSplitFifoCodeEntity::getCode)

5
src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
Unescape Escape View File

@ -113,7 +113,6 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
}
for (IoSplitFifoCodeEntity ioSplitFifoCodeEntity : splitCodeEntities) {
// Boolean isOnlyInv = sysWorkplaceDocumentService.isOnlyInv(ioSplitFifoCodeEntity.getWorkPlaceCode(), ioSplitFifoCodeEntity.getBusType());
IoSplitFifoInv splitFifoInv = findByFifoCode(ioSplitFifoCodeEntity);
if (splitFifoInv != null) {
splitFifoInv.setInCount(IntUtil.value(splitFifoInv.getInCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
@ -141,10 +140,6 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
.enableRemind(false).invRemindCount(0)
.workPlaceQueueCode(orderEntity.getWorkPlaceQueueCode() == null ? setQueueCode(ioSplitFifoCodeEntity.getWorkPlaceCode(), orderEntity.getCreateUser(),ioSplitFifoCodeEntity.getRelId()) : orderEntity.getWorkPlaceQueueCode())
.build();
// if (isOnlyInv) {
// splitFifoInv.setBusType(ioSplitFifoCodeEntity.getBusType());
// }
splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount()));
save(splitFifoInv);
//更新库存工位关联

27
src/main/java/com/glxp/api/service/inout/IoStatDetailService.java
Unescape Escape View File

@ -203,33 +203,6 @@ public class IoStatDetailService extends ServiceImpl<IoStatDetailMapper, IoStatD
return statData;
}
/**
* 构造查询条件
*
* @param ioOrderDetailResultEntity
* @param lastMonth
* @return
*/
private Wrapper<IoStatMonthEntity> buildQueryWrapper(IoOrderDetailStatRsponse ioOrderDetailResultEntity, DateTime lastMonth) {
QueryWrapper<IoStatMonthEntity> wrapper = new QueryWrapper<>();
if (lastMonth.monthBaseOne() == 1) {
//当前汇总的记录为1月，上一月份的时间取前一年的12月
wrapper.eq("year", lastMonth.year() - 1)
.eq("month", 12);
} else {
wrapper.eq("year", lastMonth.year())
.eq("month", lastMonth.monthBaseOne() - 1);//取上上月的数据
}
wrapper.eq("relIdFk", ioOrderDetailResultEntity.getBindRlFk());
wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getDeptCode()), "deptCode", ioOrderDetailResultEntity.getDeptCode());
wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getBatchNo()), "batchNo", ioOrderDetailResultEntity.getBatchNo());
wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getNameCode()), "nameCode", ioOrderDetailResultEntity.getNameCode())
.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getNameCode()), "invCode", ioOrderDetailResultEntity.getInvCode());
return wrapper;
}
}

20
src/main/java/com/glxp/api/service/inout/PlatformService.java
Unescape Escape View File

@ -15,11 +15,11 @@ import java.util.Map;
public interface PlatformService {
public int save(PlatformEntity platformEntity);
int save(PlatformEntity platformEntity);
public int remove(String id);
int remove(String id);
public BaseResponse update(PlatformEntity platformEntity);
BaseResponse update(PlatformEntity platformEntity);
List<PlatformEntity> list(Map<String, Object> map);
@ -87,21 +87,11 @@ public interface PlatformService {
* @param platformLinkRequest
* @return
*/
public String verifyUnitMaintainPlatform(PlatformLinkRequest platformLinkRequest);
/**
* 查询关联数据
*
* @param customerId
* @param action
* @param unitId
* @return
*/
UnitMaintainPlatformEntity findLinkData(long customerId, String action, String unitId);
String verifyUnitMaintainPlatform(PlatformLinkRequest platformLinkRequest);
/**
* 获取客户关联详情
* @param platformId
* @param platformLinkRequest
* @return
*/
List<PlatformLinkResponse> selectDelectList(PlatformLinkRequest platformLinkRequest);

43
src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java
Unescape Escape View File

@ -116,27 +116,6 @@ public class ExcelServiceImpl implements ExcelService {
*/
@Override
public void excelSheetExport(HttpServletResponse response) {
// try {
// //构建多集合集合
// List<List<?>> lists = new ArrayList<>();
// lists.add(structureDate(10));
// lists.add(structureDate(20));
// lists.add(structureDate(30));
// lists.add(structureDate(40));
// lists.add(structureDate(50));
// lists.add(structureDate(60));
// //Sheet页初始化
// Map<Integer, String> clazzMap = new HashMap<>();
// clazzMap.put(0, "一年级成绩表");
// clazzMap.put(1, "二年级成绩表");
// clazzMap.put(2, "三年级成绩表");
// clazzMap.put(3, "四年级成绩表");
// clazzMap.put(4, "五年级成绩表");
// clazzMap.put(5, "六年级成绩表");
// excelHandler.exportExcels(response, Collections.singletonList(lists), clazzMap, "excel导出-单sheet");
// } catch (Exception e) {
// throw new RenException("导出失败");
// }
}
/**
@ -146,19 +125,7 @@ public class ExcelServiceImpl implements ExcelService {
*/
@Override
public void excelTemplate(HttpServletResponse response) {
// try {
// //准备数据
// JSONObject obj = new JSONObject();
// obj.put("date","2022年");
// obj.put("season","秋季");
// obj.put("user","王远");
// obj.put("userDate",new Date());
// List<ExcelVO> list = structureDate(20);
// excelHandler.exportTemplateExcels(response,list,obj, ExcelTemplateEnum.TEMPLATE_1.getDesc(),ExcelTemplateEnum.TEMPLATE_1.getDesc());
// }catch (Exception e){
// log.error("导出错误：{}", e.getMessage());
// throw new RenException("导出错误");
// }
}
/**
@ -168,14 +135,6 @@ public class ExcelServiceImpl implements ExcelService {
*/
@Override
public void excelSheetTemplate(HttpServletResponse response) throws Exception {
// 准备数据
// JSONObject obj = new JSONObject();
// obj.put("date","2022年");
// obj.put("season","秋季");
// obj.put("user","王远");
// obj.put("userDate",new Date());
// List<ExcelVO> list = structureDate(20);
// excelHandler.exportSheetTemplateExcels(response,list,list,obj,obj, ExcelTemplateEnum.TEMPLATE_1.getDesc(),ExcelTemplateEnum.TEMPLATE_1.getDesc());
}
/**

3
src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java
Unescape Escape View File

@ -42,9 +42,6 @@ public class IoCodeLostServiceImpl extends ServiceImpl<IoCodeLostMapper, IoCodeL
}
return codeLostEntityMapper.selectLost(ioCodeLostRequest);
}
@Resource
RelCodeBatchService relCodeBatchService;
@Resource
RelCodeDetailService relCodeDetailService;

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

@ -47,10 +47,6 @@ public class IoDepartmentOrderServiceImpl implements IoDepartmentOrderService {
if (filterSkSiackerListRequest == null) {
return Collections.emptyList();
}
// if (filterSkSiackerListRequest.getPage() != null) {
// int offset = (filterSkSiackerListRequest.getPage() - 1) * filterSkSiackerListRequest.getLimit();
// PageHelper.offsetPage(offset, filterSkSiackerListRequest.getLimit());
// }
List<BasicSkSickerEntity> data = skSickerMapper.getSkSickerList(filterSkSiackerListRequest);
return data;
}

42
src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
Unescape Escape View File

@ -58,8 +58,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
@Lazy
IoOrderDetailBizDao ioOrderDetailBizDao;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
CustomerService customerService;
@Resource
private IBasicBussinessTypeService basicBussinessTypeService;
@ -68,8 +66,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
BasicSkProjectService basicSkProjectService;
@Resource
private UdiRelevanceService udiRelevanceService;
@Resource
IoOrderDetailBizService orderDetailBizService;
@ -171,17 +167,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
return ioOrderDetailBizDao.filterList(orderDetailBizRequest);
}
@Override
public List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
if (null == OrderDetailCodeRequest) {
return Collections.emptyList();
}
if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) {
PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit());
}
return ioOrderDetailBizDao.getfilterList(OrderDetailCodeRequest);
}
@Override
public List<IoOrderDetailResultResponse> getInvoicResultDetail(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
if (null == OrderDetailCodeRequest) {
@ -200,8 +185,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
@Override
public IoOrderEntity addWarlockBagProduct(AddWarlockBagProductReqeust addWarlockBagProductReqeust) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert");
// boolean isVailCert = systemParamConfigEntity.getParamValue().equals("1") ? true : false;
AuthAdmin authAdmin = customerService.getUserBean();
if (addWarlockBagProductReqeust.getId() == null)
throw new JsonException("未选择术式组套信息");
@ -289,18 +272,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
}
}
// if (bussinessTypeEntity.getCheckVailDate() != 4) {
// if (bussinessTypeEntity.getRequireScanCode() == 1) {
// if (udiRelevanceResponse.getRequireScanCode() != 1){
// throw new JsonException("单据只允许录入需要扫码耗材" + ",请检查后重试！");
// }
// }else if (bussinessTypeEntity.getRequireScanCode() == 0){
// if (udiRelevanceResponse.getRequireScanCode() != 0){
// throw new JsonException("单据只允许录入不需要扫码耗材" + ",请检查后重试！");
// }
// }
// }
if (bussinessTypeEntity != null && udiRelevanceResponse != null) {
//是否校验耗材材质 1：高值耗材；2.普通耗材
if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) {
@ -375,19 +346,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
return ioOrderDetailBizDao.orderOutRecordPage(orderDetailBizRequest);
}
@Override
public IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk) {
QueryWrapper<IoOrderDetailBizEntity> ew = new QueryWrapper<>();
if (StrUtil.isNotEmpty(batchNo)) {
ew.eq("batchNo", batchNo);
}
if (StrUtil.isNotEmpty(bindRlFk)) {
ew.eq("bindRlFk", bindRlFk);
}
IoOrderDetailBizEntity ioOrderDetailBizEntity = ioOrderDetailBizDao.selectOne(ew.last("limit 1"));
return ioOrderDetailBizEntity;
}
@Override
public BaseResponse addBizProduct(AddBizProductReqeust addBizProductReqeust) {
// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert");

3
src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java
Unescape Escape View File

@ -169,10 +169,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
@Override
public List<IoOrderDetailCodeEntity> finishBizDetail(List<String> orders ) {
LambdaQueryWrapper<IoOrderDetailCodeEntity> lw = new LambdaQueryWrapper<>();
// String keyWords = finishBizRequest.getKeyWords();
// lw.apply(StrUtil.isNotBlank(keyWords),"( coName LIKE concat('%', {0}, '%') or spec LIKE concat('%', {0}, '%') or batchNo LIKE concat('%', {0}, '%')) ",keyWords);
lw.in(IoOrderDetailCodeEntity::getOrderIdFk,orders);
return ioOrderDetailCodeDao.selectList(lw);
}

18
src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java
Unescape Escape View File

@ -55,20 +55,6 @@ public class IoOrderInvoiceService extends ServiceImpl<IoOrderInvoiceMapper, IoO
return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceRequest);
}
public boolean updateRegStatus(IoOrderDetailCodeEntity orderDetailCodeEntity) {
IoOrderInvoiceRequest orderInvoiceRequest = new IoOrderInvoiceRequest();
orderInvoiceRequest.setBatchNo(orderDetailCodeEntity.getBatchNo());
orderInvoiceRequest.setBindRlFk(orderDetailCodeEntity.getBindRlFk() + "");
List<IoOrderInvoiceEntity> orderInvoiceEntities = selectOrderInvoice(orderInvoiceRequest);
if (CollUtil.isNotEmpty(orderInvoiceEntities)) {
orderDetailCodeEntity.setRegStatus(true);
} else {
orderDetailCodeEntity.setRegStatus(false);
}
orderDetailCodeDao.updateById(orderDetailCodeEntity);
return true;
}
public IoOrderResponse findRegStausByBillNo(IoOrderResponse orderResponse) {
List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceMapper.selectList(new QueryWrapper<IoOrderInvoiceEntity>().eq("orderIdFk", orderResponse.getBillNo()));
List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderResponse.getBillNo()));
@ -107,10 +93,6 @@ public class IoOrderInvoiceService extends ServiceImpl<IoOrderInvoiceMapper, IoO
}
public boolean findRegStausByProduct(String billNo) {
return false;
}
public List<IoOrderInvoiceResponse> filterGroupBy(IoOrderInvoiceRequest orderInvoiceRequest) {
if (orderInvoiceRequest.getPage() != null) {
int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit();

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

@ -303,8 +303,6 @@ public class IoOrderServiceImpl implements IoOrderService {
invProductService.update(invProductEntity);
}
}
// //删除库存详情
// invProductServiceNew.deleteByOrderId(billNo);
}
}
}
@ -448,16 +446,6 @@ public class IoOrderServiceImpl implements IoOrderService {
InvProductNewVo invProductDetailEntity = invProductServiceNew.selectByCode(codeEntity.getOrderId(), codeEntity.getCode(), codeEntity.getPrice());
if (invProductDetailEntity != null) {
// (20241017===关于库存详情的删除修改进行注释)
// int count = invProductDetailEntity.getCount() - remainCount;
// if (count == 0) {
// invProductServiceNew.deleteById(invProductDetailEntity.getId());
// } else {
// //更新详情表
// invProductDetailEntity.setCount(count);
// invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - remainScanCount);
// invProductServiceNew.update(invProductDetailEntity);
// }
//更新产品表
InvProductEntity invProductEntity = invProductService.selectByUnique(invProductDetailEntity.getRelIdFk(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(),
invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode(), invProductDetailEntity.getPrice());
@ -579,7 +567,6 @@ public class IoOrderServiceImpl implements IoOrderService {
invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
invProductService.update(invProductEntity);
}
// invProductServiceNew.deleteByOrderId(billNo);
}
}
@ -632,17 +619,6 @@ public class IoOrderServiceImpl implements IoOrderService {
return orderDao.filterList(filterOrderRequest);
}
@Override
public List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest) {
if (null == filterOrderRequest) {
return Collections.emptyList();
}
if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
}
return orderDao.getfilterList(filterOrderRequest);
}
@Override
public List<IoOrderEntity> filterOrderList(FilterOrderRequest filterOrderRequest) {
@ -964,12 +940,6 @@ public class IoOrderServiceImpl implements IoOrderService {
}
}
@Override
public boolean isExitByAction(String action) {
return orderDao.exists(new QueryWrapper<IoOrderEntity>().eq("action", action));
}
@Override
public List<IoOrderEntity> findAllByAction(String action) {
return orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("action", action));
@ -1039,12 +1009,6 @@ public class IoOrderServiceImpl implements IoOrderService {
List<IoOrderEntity> ioOrderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("createUser", userId));
return ioOrderEntities;
}
@Override
public List<String> selectOrderIdList(String data) {
return orderDao.selectOrderIdList(data);
}
@Override
public void updateOrderInventory(String billNo, Integer status) {
//查询单据表
@ -1078,13 +1042,8 @@ public class IoOrderServiceImpl implements IoOrderService {
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setWorkPlaceCode(workPlaceCode);
filterOrderRequest.setStatus(1);//处理中的订单
// filterOrderRequest.setUpdateUser(userId + "");
filterOrderRequest.setWorkPlaceQueueCode(getWorkPlaceQueueCode);
List<IoOrderResponse> ioOrderResponses = orderDao.filterList(filterOrderRequest);
// QueryWrapper<IoOrderEntity> ew = new QueryWrapper<>();
// ew.eq("workPlaceCode", workPlaceCode);
// ew.eq("status", 9);
// ew.eq("updateUser", userId);
if (ioOrderResponses.size() > 0){
IoOrderResponse ioOrderResponse = ioOrderResponses.get(0);
return ioOrderResponse;
@ -1092,11 +1051,6 @@ public class IoOrderServiceImpl implements IoOrderService {
return null;
}
@Override
public String selectAliYljgSearchbillByAliBillNo(String key) {
return orderDao.selectAliYljgSearchbillByAliBillNo(key);
}
/**
* 查询此单据关联的所有单据
@ -1105,56 +1059,14 @@ public class IoOrderServiceImpl implements IoOrderService {
* @return
*/
private List<IoOrderEntity> getAllOrder(IoOrderEntity order) {
// Set<String> billNos = new HashSet<>();
// billNos.add(order.getBillNo());
List<IoOrderEntity> orderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("relKey", order.getRelKey()));
// getLinkedBillNo(order.getBillNo(), billNos);
//
// //去除本单的单据号
// Iterator<String> iterator = billNos.iterator();
// while (iterator.hasNext()) {
// if (iterator.next().equals(order.getBillNo())) {
// iterator.remove();
// break;
// }
// }
//
// ArrayList<IoOrderEntity> orders = new ArrayList<>();
// if (CollUtil.isNotEmpty(billNos)) {
// List<IoOrderEntity> list = orderDao.selectList(new QueryWrapper<IoOrderEntity>().in("billNo", billNos).orderByDesc("id"));
// orders.addAll(list);
// }
//将查询入口单据放在第一位的顺序
// orders.add(0, order);
return orderEntities;
}
/**
* 查询关联的单据号
*
* @param billNo
* @param billNos
*/
private void getLinkedBillNo(String billNo, Set<String> billNos) {
List<String> list = getOneBillNosByOrderId(billNo);
if (!billNos.containsAll(list)) {
//找出不包含在原有集合中的单号，回调方法
String orderId = null;
for (String item : list) {
if (!billNos.contains(item)) {
orderId = item;
break;
}
}
billNos.addAll(list);
//递归，继续查询未包含的单据号关联的单据
getLinkedBillNo(orderId, billNos);
}
}
/**
* 查询一条单据上关联的所有单据号
*

8
src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java
Unescape Escape View File

@ -51,8 +51,6 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
private IoOrderDao orderDao;
@Resource
private IoOrderDetailResultDao ioOrderDetailResultDao;
@Resource
private SystemParamConfigDao systemParamConfigDao;
@Override
public void statData(Date date) {
@ -272,12 +270,6 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
private List<IoStatMonthEntity> getNewOrOldDate(List<IoStatMonthEntity> newIoStatDayEntity, List<IoStatMonthEntity> oldIoStatDayEntity, DateTime lastMonth) {
// 计算出两个集合之间产品批次号组成的差异
// List<IoStatMonthEntity> ioStatMonthEntityList = oldIoStatDayEntity.stream().filter(notComment -> {
// List<IoStatMonthEntity> filtered = newIoStatDayEntity.stream().filter(all -> all.getBatchNo().equals(notComment.getBatchNo()) && all.getRelIdFk().equals(notComment.getRelIdFk())).collect(Collectors.toList());
// return filtered.isEmpty();
// }).collect(Collectors.toList());
List<IoStatMonthEntity> ioStatMonthEntityList = oldIoStatDayEntity.stream()
.filter(notComment -> {
List<IoStatMonthEntity> filtered = newIoStatDayEntity.stream().filter(all ->

9
src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java
Unescape Escape View File

@ -72,9 +72,6 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
orderDetailResultEntities.forEach(orderDetailResultEntity -> {
//获取新的汇总数据
IoStatQuarterEntity statData = getStatData(dataList, orderDetailResultEntity, yesterday);
//查询此单是出库还是入库
// IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode", orderDetailResultEntity.getDeptCode()));
if (orderDetailResultEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
//入库
statData.setInCount(orderDetailResultEntity.getReCount() + statData.getInCount());
@ -323,12 +320,6 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
private List<IoStatQuarterEntity> getNewOrOldDate(List<IoStatQuarterEntity> newIoStatDayEntity, List<IoStatQuarterEntity> oldIoStatDayEntity, DateTime lastMonth) {
// 计算出两个集合之间产品批次号组成的差异
// List<IoStatMonthEntity> ioStatMonthEntityList = oldIoStatDayEntity.stream().filter(notComment -> {
// List<IoStatMonthEntity> filtered = newIoStatDayEntity.stream().filter(all -> all.getBatchNo().equals(notComment.getBatchNo()) && all.getRelIdFk().equals(notComment.getRelIdFk())).collect(Collectors.toList());
// return filtered.isEmpty();
// }).collect(Collectors.toList());
List<IoStatQuarterEntity> ioStatMonthEntityList = oldIoStatDayEntity.stream()
.filter(notComment -> {
List<IoStatQuarterEntity> filtered = newIoStatDayEntity.stream().filter(all ->

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

@ -69,7 +69,6 @@ public class IoStatYearServiceImpl implements IoStatYearService {
IoStatYearEntity statData = getStatData(dataList, orderDetailResultEntity, yesterday);
//查询此单是出库还是入库
// IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode", orderDetailResultEntity.getDeptCode()));
if (orderDetailResultEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
//入库
statData.setInCount(orderDetailResultEntity.getReCount() + statData.getInCount());
@ -266,12 +265,6 @@ public class IoStatYearServiceImpl implements IoStatYearService {
private List<IoStatYearEntity> getNewOrOldDate(List<IoStatYearEntity> newIoStatDayEntity, List<IoStatYearEntity> oldIoStatDayEntity, DateTime lastMonth) {
// 计算出两个集合之间产品批次号组成的差异
// List<IoStatMonthEntity> ioStatMonthEntityList = oldIoStatDayEntity.stream().filter(notComment -> {
// List<IoStatMonthEntity> filtered = newIoStatDayEntity.stream().filter(all -> all.getBatchNo().equals(notComment.getBatchNo()) && all.getRelIdFk().equals(notComment.getRelIdFk())).collect(Collectors.toList());
// return filtered.isEmpty();
// }).collect(Collectors.toList());
List<IoStatYearEntity> ioStatMonthEntityList = oldIoStatDayEntity.stream()
.filter(notComment -> {
List<IoStatYearEntity> filtered = newIoStatDayEntity.stream().filter(all ->

314
src/main/java/com/glxp/api/service/inv/InvCountOrderService.java
Unescape Escape View File

@ -65,24 +65,12 @@ public class InvCountOrderService extends ServiceImpl<InvCountOrderMapper, InvCo
@Resource
private CustomerService customerService;
@Resource
private InvProductNewDao invProductNewDao;
@Resource
private InvCountSettingMapper invCountSettingDao;
@Resource
private BasicBussinessTypeDao bussinessTypeDao;
@Resource
private BasicCorpDao unitMaintainDao;
@Resource
private IoOrderService orderService;
@Resource
private IoCodeTempDao codesTempDao;
@Resource
private InvCountCodesService invCountCodesService;
@Resource
private IoCodeDao codesDao;
@Resource
private CompanyProductRelevanceDao companyProductRelevanceDao;
@Resource
private UdiRelevanceDao udiRelevanceDao;
@Resource
private IBasicBussinessTypeService basicBussinessTypeService;
@ -253,229 +241,6 @@ public class InvCountOrderService extends ServiceImpl<InvCountOrderMapper, InvCo
return submitAudit(invCountOrder.getOrderId());
}
// /**
// * 盘点单据转扫码单(20241017===没用到注释了)
// */
// private void countOrderTransfer(InvCountOrderEntity invCountOrder) {
// List<InvCountSettingEntity> list = invCountSettingDao.selectList(null);
// if (CollUtil.isEmpty(list)) {
// log.error("未配置盘点单据设置参数，无法转单");
// return;
// }
//
// //出入库码明细列表
// List<IoCodeTempEntity> inOrderCodes = new ArrayList<>();
// List<IoCodeTempEntity> outOrderCodes = new ArrayList<>();
//
//
// /**
// * 生成盘盈和盘亏单据逻辑
// * 盘盈单据：1、找出盘点单据码详情比库存码详情多的产品
// * 2、判断条码是否包含批次号和序列号，如果不包含，根据 盘盈数量 / 实际数量 = 多出的条码数量 ，计算出盘盈单据此条码的扫码数量
// * 3、生成条码，保存单据
// *
// * 盘亏单据：1、找出库存有，而盘点不存在的条码
// * 2、判断此库存详情是否包含批次号，如果不包含，盘亏数量 / 实际数量 = 少的条码数量，计算出盘亏单据扫码数量
// * 3、生成条码，保存单据
// */
//
// //构造库存详情查询参数
// FilterInvProductDetailRequest invProductDetailRequest = new FilterInvProductDetailRequest();
// invProductDetailRequest.setInvCode(invCountOrder.getInvStorageCode());
// invProductDetailRequest.setInvSpaceCode(invCountOrder.getInvWarehouseCode());
// //库存早于或等于盘点时间的库存数据，锁库存
// invProductDetailRequest.setUpdateTime(invCountOrder.getCreateTime());
//
// if (invCountOrder.getCountType() == 1) {
// //按照货位盘点，查询库存详情添加货位条件
// invProductDetailRequest.setInvSpaceCode(invCountOrder.getInvWarehouseCode());
// }
//
// FilterInvCountOrderDetailRequest detailRequest = new FilterInvCountOrderDetailRequest();
// detailRequest.setOrderIdFk(invCountOrder.getOrderId());
// //查询亏损单据详情
// detailRequest.setStatus(0);
// List<InvCountOrderDetailEntity> lossDetailList = invCountOrderDetailDao.selectDetailList(detailRequest);
// if (CollUtil.isNotEmpty(lossDetailList)) {
// log.info("开始生成盘亏单据码明细");
// log.info("查询盘亏产品码详情");
//
// for (InvCountOrderDetailEntity invCountOrderDetail : lossDetailList) {
// //查询库存详情
// invProductDetailRequest.setRelId(invCountOrderDetail.getProductId());
// invProductDetailRequest.setBatchNo(invCountOrderDetail.getBatchNo());
// List<InvProductNewVo> invProductDetailEntities = invProductNewDao.filterInvProductDetailList(invProductDetailRequest);
// //查询盘点码明细
// FilterInvCountCodesRequest codesRequest = new FilterInvCountCodesRequest();
// codesRequest.setOrderIdFk(invCountOrder.getOrderId());
// codesRequest.setProductId(invCountOrderDetail.getProductId());
// codesRequest.setBatchNo(invCountOrderDetail.getBatchNo());
// List<String> countCodesList = invCountCodesDao.selectCodes(codesRequest);
// List<String> invProductCodes = invProductDetailEntities.stream().map(InvProductNewVo::getCode).collect(Collectors.toList());
// List<String> lossCodes = CollUtil.subtractToList(invProductCodes, countCodesList);
// if (CollUtil.isNotEmpty(countCodesList) && CollUtil.isEmpty(lossCodes)) {
// //盘点的码不为空，但是盘点数量和库存数量不一样，比对差集结果为空，说明是同一个条码，数量不同，直接根据盘亏数量计算生成一个扫码单据的码明细
// //生成码详情
// IoCodeTempEntity warehouseEntity = buildWarehouse(invCountOrder, invProductDetailEntities.get(0).getCode(), invProductDetailEntities.get(0).getRelId());
// //判断此条码，是否有批次号和序列号
// UdiEntity udi = FilterUdiUtils.getUdi(invProductDetailEntities.get(0).getCode());
// //修改码数量
// int actCount = invCountCodesService.getActCount(udi.getUdi());
// //使用此盘点单据详情的盘亏数量 / 实际数量，计算得出扫码数量
// int codeNum = invCountOrderDetail.getLossNum() / actCount;
// warehouseEntity.setCount(codeNum);
// warehouseEntity.setReCount(codeNum);
//
// //设置供应商信息
// setSupInfo(warehouseEntity, "loss");
// outOrderCodes.add(warehouseEntity);
// } else {
// for (InvProductNewVo invProductDetailEntity : invProductDetailEntities) {
// if (!countCodesList.contains(invProductDetailEntity.getCode()) && !verifyCodeExist(outOrderCodes, invProductDetailEntity.getCode())) {
// //生成码详情
// IoCodeTempEntity warehouseEntity = buildWarehouse(invCountOrder, invProductDetailEntity.getCode(), invProductDetailEntity.getRelId());
// //判断此条码，是否有批次号和序列号
// UdiEntity udi = FilterUdiUtils.getUdi(invProductDetailEntity.getCode());
// if ((StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo())) || (StrUtil.isBlank(udi.getSerialNo()) && StrUtil.isNotBlank(udi.getBatchNo()))) {
// //修改码数量
// int actCount = invCountCodesService.getActCount(udi.getUdi());
// //使用此盘点单据详情的盘亏数量 / 实际数量，计算得出扫码数量
// int codeNum = invCountOrderDetail.getLossNum() / actCount;
// warehouseEntity.setCount(codeNum);
// warehouseEntity.setReCount(codeNum);
// } else {
// //修改实际数量
// int actCount = invCountCodesService.getActCount(udi.getUdi());
// warehouseEntity.setCount(actCount);
// warehouseEntity.setReCount(actCount);
// }
//
// //设置供应商信息
// setSupInfo(warehouseEntity, "loss");
// outOrderCodes.add(warehouseEntity);
// }
// }
// }
// }
// log.info("盘亏单据码明细生成完毕");
// }
//
// //生成盘盈单据的条码
// //查询盘盈的单据详情
// detailRequest.setStatus(1);
// List<InvCountOrderDetailEntity> profitDetailList = invCountOrderDetailDao.selectDetailList(detailRequest);
// if (CollUtil.isNotEmpty(profitDetailList)) {
// log.info("开始生成盘盈单据码.明细");
// //查询盘盈产品的库存详情
// for (InvCountOrderDetailEntity invCountOrderDetail : profitDetailList) {
// //查询库存详情
// invProductDetailRequest.setRelId(invCountOrderDetail.getProductId());
// invProductDetailRequest.setBatchNo(invCountOrderDetail.getBatchNo());
// List<InvProductNewVo> invProductDetailEntities = invProductNewDao.filterInvProductDetailList(invProductDetailRequest);
// //查询盘点码明细
// FilterInvCountCodesRequest codesRequest = new FilterInvCountCodesRequest();
// codesRequest.setOrderIdFk(invCountOrder.getOrderId());
// codesRequest.setProductId(invCountOrderDetail.getProductId());
// codesRequest.setBatchNo(invCountOrderDetail.getBatchNo());
// List<String> countCodesList = invCountCodesDao.selectCodes(codesRequest);
// List<String> invProductCodeList = invProductDetailEntities.stream().map(InvProductNewVo::getCode).collect(Collectors.toList());
// List<String> profitCodes = CollUtil.subtractToList(countCodesList, invProductCodeList); //计算盘盈的条码
// log.info("查询盘盈产品的库存详情");
// if (CollUtil.isNotEmpty(invProductCodeList) && CollUtil.isEmpty(profitCodes)) {
// /**
// * 盘点条码不为空，且库存条码也不为空，但是计算的条码差集为空
// * 说明盘点的条码和库存的条码是相同的条码，直接根据盘盈数量计算出扫码数量，生成一个条码即可
// */
// String code = null;
// if (CollUtil.isNotEmpty(countCodesList)) {
// code = countCodesList.get(0);
// } else {
// code = invProductCodeList.get(0);
// }
// IoCodeTempEntity warehouseEntity = buildWarehouse(invCountOrder, code, Long.parseLong(invCountOrderDetail.getProductId()));
// //判断此条码，是否有批次号和序列号
// UdiEntity udi = FilterUdiUtils.getUdi(code);
// //修改码数量
// int actCount = invCountCodesService.getActCount(udi.getUdi());
// //使用此盘点单据详情的盘盈数量 / 实际数量，计算得出扫码数量
// int codeNum = invCountOrderDetail.getProfitNum() / actCount;
// warehouseEntity.setCount(codeNum);
// warehouseEntity.setReCount(codeNum);
// setSupInfo(warehouseEntity, "profit");
// inOrderCodes.add(warehouseEntity);
// log.info("添加库存条码");
// } else {
//
// for (String code : profitCodes) {
// log.info("添加盘盈入库条码");
// if (!verifyCodeExist(inOrderCodes, code)) {
// //生成码详情
// IoCodeTempEntity warehouseEntity = buildWarehouse(invCountOrder, code, Long.parseLong(invCountOrderDetail.getProductId()));
// //判断此条码，是否有批次号和序列号
// UdiEntity udi = FilterUdiUtils.getUdi(code);
// if ((StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo())) || (StrUtil.isBlank(udi.getSerialNo()) && StrUtil.isNotBlank(udi.getBatchNo()))) {
// //修改码数量
// int actCount = invCountCodesService.getActCount(udi.getUdi());
// //使用此盘点单据详情的盘盈数量 / 实际数量，计算得出扫码数量
// int codeNum = invCountOrderDetail.getProfitNum() / actCount;
// warehouseEntity.setCount(codeNum);
// warehouseEntity.setReCount(codeNum);
// } else {
// //修改实际数量
// int actCount = invCountCodesService.getActCount(udi.getUdi());
// warehouseEntity.setCount(actCount);
// warehouseEntity.setReCount(actCount);
// }
// setSupInfo(warehouseEntity, "profit");
// inOrderCodes.add(warehouseEntity);
// }
// }
// }
// }
// log.info("盘盈单据码详情生成完毕");
// }
//
// InvCountSettingEntity invCountSettingEntity = list.get(0);
//
// if (CollUtil.isNotEmpty(inOrderCodes)) {
// log.info("盘点单据：{} 生成盘盈入库单据", invCountOrder.getOrderId());
// IoOrderEntity order = createOrder(invCountSettingEntity, invCountOrder, ConstantType.TYPE_PUT);
// log.info("盘盈入库单据号：{}", order.getBillNo());
// inOrderCodes.forEach(warehouseEntity -> {
// warehouseEntity.setOrderId(order.getBillNo());
// warehouseEntity.setAction(order.getAction());
// warehouseEntity.setCorpOrderId(order.getCorpOrderId());
// });
//
// invCountOrder.setInOrderIds(order.getBillNo());
// orderService.insertOrder(order);
// codesTempDao.insertBatch(inOrderCodes);
// log.info("盘盈入库单据生成成功");
// }
//
// if (CollUtil.isNotEmpty(outOrderCodes)) {
// log.info("盘点单据：{} 生成盘亏入库单据", invCountOrder.getOrderId());
// IoOrderEntity order = createOrder(invCountSettingEntity, invCountOrder, ConstantType.TYPE_OUT);
// log.info("盘亏入库单据号：{}", order.getBillNo());
// outOrderCodes.forEach(warehouseEntity -> {
// warehouseEntity.setOrderId(order.getBillNo());
// warehouseEntity.setAction(order.getAction());
// warehouseEntity.setCorpOrderId(order.getCorpOrderId());
// String supId = codesDao.selectSupIdByCode(warehouseEntity.getCode());
// warehouseEntity.setSupId(supId);
// });
//
// invCountOrder.setOutOrderIds(order.getBillNo());
// orderService.insertOrder(order);
// codesTempDao.insertBatch(outOrderCodes);
// log.info("盘亏入库单据生成成功");
// }
//
// //更新盘点单据生成的扫码单据号
// invCountOrderDao.updateByOrderId(invCountOrder);
// }
/**
* 新版盘点单据转换
*/
@ -577,76 +342,6 @@ public class InvCountOrderService extends ServiceImpl<InvCountOrderMapper, InvCo
return warehouseEntity;
}
/**
* 对条码添加供应商信息（(20241017===没用到注释了)）
*
* @param warehouseEntity 码明细
* @param countStatus 盈亏状态
*/
// private void setSupInfo(IoCodeTempEntity warehouseEntity, String countStatus) {
// /**
// * 根据此码明细的盈亏状态，使用不同的逻辑生成供应商信息
// * 盘盈：此条码不存在于库存详情中，需要从供应商产品信息表查询供应商信息
// * 盘亏：此条码在库存中存在，但是盘点中没有此条码，直接查询库存详情表中的供应商ID
// *
// * 若查询出的供应商信息多余1条，则表明此产品被多个供应商绑定，在此处不进行绑定，单据生成之后会进入异常单据页面，在异常单据页面手动指定供应商
// */
// if (countStatus.equals("loss")) {
// log.info("生成盘亏单据条码供应商详情，条码信息：{}", warehouseEntity.getCode());
// List<String> supIds = invProductNewDao.selectSupIdByCode(warehouseEntity.getCode());
// if (CollUtil.isNotEmpty(supIds)) {
// if (supIds.size() == 1) {
// //此产品只绑定了一个供应商，若绑定了多个供应商，则不填供应商ID字段，生成单据之后会进入异常单据页面，手动指定供应商
// warehouseEntity.setSupId(supIds.get(0));
// }
// }
// } else {
// log.info("生成盘盈单据条码供应商详情，条码信息：{}", warehouseEntity.getCode());
// List<String> unitFkList = companyProductRelevanceDao.selectUnitFkByUdiRlIdFk(warehouseEntity.getRelId() + "");
// if (CollUtil.isNotEmpty(unitFkList)) {
// if (unitFkList.size() == 1) {
// //此产品只绑定了一个供应商，若绑定了多个供应商，则不填供应商ID字段，生成单据之后会进入异常单据页面，手动指定供应商
// warehouseEntity.setSupId(unitFkList.get(0));
// }
// }
// }
// }
/**
* 校验码重复
*
* @param codes
* @param code
* @return
*/
private boolean verifyCodeExist(List<IoCodeTempEntity> codes, String code) {
for (IoCodeTempEntity warehouseEntity : codes) {
if (warehouseEntity.getCode().equals(code)) {
return true;
}
}
return false;
}
private static IoCodeTempEntity buildWarehouse(InvCountOrderEntity invCountOrder, String code, Long productId) {
IoCodeTempEntity warehouseEntity = new IoCodeTempEntity();
warehouseEntity.setOrderId(invCountOrder.getOrderId());
warehouseEntity.setCode(code);
warehouseEntity.setRelId(productId);
warehouseEntity.setMainAction(ConstantType.TYPE_PUT);
warehouseEntity.setInvCode(invCountOrder.getInvStorageCode());
warehouseEntity.setWarehouseCode(invCountOrder.getInvWarehouseCode());
UdiEntity udi = FilterUdiUtils.getUdi(code);
warehouseEntity.setBatchNo(udi.getBatchNo());
warehouseEntity.setProduceDate(udi.getProduceDate());
warehouseEntity.setExpireDate(udi.getExpireDate());
warehouseEntity.setSerialNo(udi.getSerialNo());
warehouseEntity.setNameCode(udi.getUdi());
warehouseEntity.setCount(1);
warehouseEntity.setReCount(1);
return warehouseEntity;
}
/**
* 生成单据和条码数据
*
@ -694,15 +389,6 @@ public class InvCountOrderService extends ServiceImpl<InvCountOrderMapper, InvCo
return orderEntity;
}
// private String getSupId(IoCodeTempEntity warehouseEntity) {
// List<String> supIds = companyProductRelevanceDao.selectUnitFkByUdiRlIdFk(warehouseEntity.getRelId() + "");
// if (CollUtil.isNotEmpty(supIds) && supIds.size() == 1) {
// return supIds.get(0);
// }
// return null;
// }
public InvCountOrderEntity selectByOrderId(String orderId) {
return invCountOrderDao.selectByOrderId(orderId);
}

1
src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java
Unescape Escape View File

@ -11,7 +11,6 @@ import java.util.List;
public interface InvInnerOrderPrintService {
List<InvInnerOrderPrintEntity> filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
Boolean addOrderList(String orderIdFk);

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

@ -20,8 +20,6 @@ public interface InvPlaceOrderService {
List<InvPlaceOrderResponse> filterList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest);
BaseResponse addInvPlaceOrder(AddInvPlaceOrderRequest addInvPlaceOrderRequest);
//单条绑定货位
BaseResponse bindInvSpaceOne(BindInvSpaceRequest bindInvSpaceRequest);

15
src/main/java/com/glxp/api/service/inv/InvPlaceService.java
Unescape Escape View File

@ -43,15 +43,6 @@ public interface InvPlaceService {
*/
BaseResponse unbindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest);
// /**
// * 更换货位(20241017===没用到注释了)
// *
// * @param bindInvSpaceRequest
// */
// BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest);
/**
* 校验库存详情绑定货位信息
*
@ -60,12 +51,6 @@ public interface InvPlaceService {
*/
BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest);
/**
* @param bindInvSpaceRequest
* @return
*/
List<InvPlaceDetailResponse> getInvProductInfo(BindInvSpaceRequest bindInvSpaceRequest);
/**
* 从库存详情查询单据列表
*

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

@ -50,13 +50,7 @@ public interface InvPreProductDetailService {
*/
boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest);
int findCountByCode(String code);
InvPreProductDetailEntity findUseOneByCode(String code);
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);
}

8
src/main/java/com/glxp/api/service/inv/InvPreProductService.java
Unescape Escape View File

@ -31,16 +31,8 @@ public interface InvPreProductService {
List<InvPreProductResponse> filterListStock(FilterInvPreProductRequest invPreProductRequest);
List<InvPreProductResponse> findGroupBySpace(FilterInvPreProductRequest invPreProductRequest);
/**
* 查询寄售库存列表
*
* @param invPreProductRequest
* @return
*/
List<InvPreProductEntity> filterPreProductList(FilterInvPreProductRequest invPreProductRequest);
/**
* 根据ID查询寄售库存信息

9
src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java
Unescape Escape View File

@ -17,13 +17,6 @@ public interface InvPreinDetailService {
List<InvPreinDetailEntity> findByCode(String code);
// InvPreinDetailEntity findOneByCode(String code);
List<InvPreinDetailEntity> findUseByCode(String code);
InvPreinDetailEntity findUseOneByCode(String code);
int deleteByOrderId(String orderId);
int deleteById(Integer id);
@ -34,6 +27,4 @@ public interface InvPreinDetailService {
int update(InvPreinDetailEntity invPreinDetailEntity);
int updateBack(String orderId);
}

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

@ -13,7 +13,7 @@ public interface InvPreinOrderService {
List<InvPreinOrderResponse> filterList(FilterInvPreinRequest filterInvPreinRequest);
public void insert(InvPreinOrderEntity invPreinOrderEntity);
void insert(InvPreinOrderEntity invPreinOrderEntity);
int deleteByOrderId(String orderId);

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

@ -48,19 +48,8 @@ public interface InvPreinProductDetailService {
*/
void setOrderInfo(InvPreProductDetailResponse response);
/**
* 删除寄售库存详情
*
* @param detailRequest
*/
boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest);
int findCountByCode(String code);
int findCountBySpaceCode(String spaceCode, String code);
InvPreInProductDetailEntity findUseOneByCode(String code);
int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode);
int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code);

12
src/main/java/com/glxp/api/service/inv/InvPreinProductService.java
Unescape Escape View File

@ -31,20 +31,9 @@ public interface InvPreinProductService {
*/
List<InvPreinProductResponse> filterList(FilterInvPreinProductRequest filterInvPreinDetailRequest);
List<InvPreinProductResponse> filterListStock(FilterInvPreinProductRequest filterInvPreinDetailRequest);
/**
* 查询寄售库存列表
*
* @param invPreProductRequest
* @return
*/
List<InvPreinProductEntity> filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest);
List<InvPreinProductResponse> findGroupBySpace(FilterInvPreinProductRequest filterInvPreinDetailRequest);
/**
* 根据ID查询寄售库存信息
*
@ -53,5 +42,4 @@ public interface InvPreinProductService {
*/
InvPreinProductEntity findById(String id);
boolean isExitByRelId(String relId);
}

7
src/main/java/com/glxp/api/service/inv/InvUserProductDetailService.java
Unescape Escape View File

@ -13,14 +13,7 @@ import java.util.List;
*/
public interface InvUserProductDetailService{
List<InvUserProductDetailEntity> filterInvUserProductDetailList(InvUserProductDetailEntity invUserProductDetailEntity);
Boolean addInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity);
Boolean addInvUserProductDetailList(List<InvUserProductDetailEntity> invUserProductDetailEntityList);
Boolean updateInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity);
Boolean delectInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity);
}

4
src/main/java/com/glxp/api/service/inv/InvUserProductService.java
Unescape Escape View File

@ -14,14 +14,10 @@ import java.util.List;
*/
public interface InvUserProductService{
List<InvUserProductEntity> filterInvUserProductList(InvUserProductEntity invUserProductEntity);
Boolean addInvUserProduct(InvUserProductEntity invUserProductEntity);
Boolean updateInvUserProduct(InvUserProductEntity invUserProductEntity);
Boolean delectInvUserProduct(InvUserProductEntity invUserProductEntity);
InvUserProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode,String userId,Integer type);

3
src/main/java/com/glxp/api/service/inv/StockCompareDetailService.java
Unescape Escape View File

@ -18,9 +18,6 @@ public interface StockCompareDetailService extends CustomService<StockCompareDet
Page<InvProductDetailSelectVo> invProductDetailSelectPage(InvProductDetailSelectQuery query);
List<StockCompareDetailResponse> filterCompareDetail(InvProductDetailSelectRequest invProductDetailSelectRequest);
}

19
src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java
Unescape Escape View File

@ -77,17 +77,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
@Resource
IoOrderDetailBizService ioOrderDetailBizService;
@Override
public List<InvInnerOrderPrintEntity> filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest) {
if (filterinnerOrderprintRequest == null) {
return Collections.emptyList();
}
int offset = (filterinnerOrderprintRequest.getPage() - 1) * filterinnerOrderprintRequest.getLimit();
PageHelper.offsetPage(offset, filterinnerOrderprintRequest.getLimit());
List<InvInnerOrderPrintEntity> data = invInnerOrderPrintDao.filterOrderPrintList(filterinnerOrderprintRequest);
return data;
}
@Override
public Boolean addOrderList(String orderIdFk) {
//先删除数据
@ -126,7 +115,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
a = Integer.parseInt(filterUdiRelRequest.getPackLevel()) - 1;
}
UdiProductEntity udiProductEntity1 = udiProductService.selectUdiByName(obj.getNameCode());
// UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0);
filterUdiRelRequest.setProductsType(udiProductEntity1.getProductsType());
UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(a);
//查询产品信息
@ -274,8 +262,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
@Resource
IoOrderService orderService;
@Resource
UdiCalCountUtil udiCalCountUtil;
//-----------------------------------------------------------业务单据打印-----------------------------//
@Override
@ -310,11 +296,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
innerOrderPrintEntity.setUpdateUser(customerService.getUserId() + "");
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
filterUdiRelRequest.setId(Long.valueOf(obj.getBindRlFk()));
//查询耗材字典信息
// UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0);
//查询产品信息
// UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
String udiCode = "#" + obj.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
"#" + obj.getBatchNo() + "#" + "#" + "#";
udiCode = udiCode.replaceAll("#null", "#");

51
src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java
Unescape Escape View File

@ -73,55 +73,8 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
return invPlaceOrderDao.filterList(filterInvPlaceOrderRequest);
}
@Override
public BaseResponse addInvPlaceOrder(AddInvPlaceOrderRequest addInvPlaceOrderRequest) {
if (StrUtil.isBlank(addInvPlaceOrderRequest.getInvCode()) || StrUtil.isBlank(addInvPlaceOrderRequest.getInvSpaceCode()) || CollUtil.isEmpty(addInvPlaceOrderRequest.getCodeList()) || null == addInvPlaceOrderRequest.getType()) {
return ResultVOUtils.error(500, "参数错误");
}
if (addInvPlaceOrderRequest.getType().equals(2)) {
if (StrUtil.isBlank(addInvPlaceOrderRequest.getOrderId())) {
return ResultVOUtils.error(500, "参数错误");
}
}
//操作人ID
String userId = customerService.getUserIdStr();
//获取记录号
String recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd"));
InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity();
orderEntity.setRecordId(recordId);
orderEntity.setType(addInvPlaceOrderRequest.getType());
orderEntity.setOrderId(addInvPlaceOrderRequest.getOrderId());
orderEntity.setCreateUser(userId);
orderEntity.setCreateTime(new Date());
orderEntity.setUpdateTime(new Date());
//生成物资上架详情
addInvPlaceOrderRequest.getCodeList().forEach(invProductDetailEntity -> {
InvPlaceOrderDetailEntity orderDetailEntity = new InvPlaceOrderDetailEntity();
orderDetailEntity.setInvCode(addInvPlaceOrderRequest.getInvCode());
orderDetailEntity.setInvSpaceCode(addInvPlaceOrderRequest.getInvSpaceCode());
orderDetailEntity.setRelId(String.valueOf(invProductDetailEntity.getRelIdFk()));
// orderDetailEntity.setCode(invProductDetailEntity.getCode());
orderDetailEntity.setBatchNo(invProductDetailEntity.getBatchNo());
orderDetailEntity.setRecordId(recordId);
invPlaceOrderDetailDao.insert(orderDetailEntity);
});
invPlaceOrderDao.insert(orderEntity);
return ResultVOUtils.success();
}
@Override
public BaseResponse bindInvSpaceOne(BindInvSpaceRequest bindInvSpaceRequest) {
// QueryWrapper ew=new QueryWrapper();
// ew.eq("code",filterInvPlaceRequest.getCode());
// ew.isNull("invSpaceCode");
// ew.
// invPreInProductDetailDao.selectOne()
Long relId = null;
String batchNo = null;
String nameCode = null;
@ -175,7 +128,6 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
supId = invProductNewVo.getSupId();
produceDate = invProductNewVo.getProductionDate();
expireDate = invProductNewVo.getExpireDate();
// serialNo = invProductEntity.getSerialNo();
}
@ -317,10 +269,8 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
filterInvPlaceOrderRequest.setRelId(invProductNewVo.getRelIdFk());
filterInvPlaceOrderRequest.setNameCode(invProductNewVo.getNameCode());
filterInvPlaceOrderRequest.setCount(invProductNewVo.getReCount());
// filterInvPlaceOrderRequest.setSerialNo(invProductEntity.getSerialNo());
filterInvPlaceOrderRequest.setProduceDate(invProductNewVo.getProductionDate());
filterInvPlaceOrderRequest.setSupId(invProductNewVo.getSupId());
// filterInvPlaceOrderRequest.setCode(invProductEntity.getCode());
filterInvPlaceOrderRequestList.add(filterInvPlaceOrderRequest);
}
}
@ -436,7 +386,6 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
supId = invProductNewVo.getSupId();
produceDate = invProductNewVo.getProductionDate();
expireDate = invProductNewVo.getExpireDate();
// serialNo = invProductEntity.getSerialNo();
}

827
src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java
Unescape Escape View File

@ -57,17 +57,9 @@ public class InvPlaceServiceImpl implements InvPlaceService {
@Resource
private InvSpaceDao invSpaceDao;
@Resource
private InvPlaceOrderService invPlaceOrderService;
@Resource
private InvPlaceOrderDao invPlaceOrderDao;
@Resource
private InvPlaceOrderDetailDao invPlaceOrderDetailDao;
@Resource
private UdiRelevanceService udiRelevanceService;
@Resource
private CustomerService customerService;
@Resource
private GennerOrderUtils gennerOrderUtils;
@Override
@ -82,261 +74,17 @@ public class InvPlaceServiceImpl implements InvPlaceService {
}
//TODO 20241017 绑定货位先注释 confirm
// 后面要重写可能所以把注释去了
@Override
public BaseResponse bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest) {
return null;
// //查询仓库的部门ID
// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
// List<InvPlaceOrderDetailEntity> invPlaceOrderDetailEntityList = new ArrayList<>();
// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper<InvPlaceOrderDetailEntity>().eq("recordId", bindInvSpaceRequest.getOrderId()));
// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) {
//
// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) {
// //拆解库存表
// QueryWrapper<InvPreInProductDetailEntity> ew = new QueryWrapper<>();
// InvPreInProductDetailEntity invPreInProductDetailEntity = new InvPreInProductDetailEntity();
// if (bindInvSpaceRequest.getType() == 3) {
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.last("limit 1");
// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
// } else {
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", ""));
// ew.gt("inCount", 0);
// ew.last("limit 1");
// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
// }
//
//
// if (invPreInProductDetailEntity.getInCount() > 0) {
// String nameCode = invPreInProductDetailEntity.getNameCode();
// int reCount = getActCount(nameCode);
// invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount() - 1);
// invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount() - 1);
// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount() - reCount);
// invPreInProductDetailDao.updateById(invPreInProductDetailEntity);
//
//
// //如果库存为空就删了该数据
// if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0)
// && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) {
// invPreInProductDetailDao.deleteById(invPreInProductDetailEntity);
// }
//
//
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode()).eq("mainAction", ConstantType.TYPE_PUT);
// if (bindInvSpaceRequest.getType() == 3) {
// ew.eq("invSpaceCode", bindInvSpaceRequest.getChangeSpaceCode());
// } else {
// ew.eq("invSpaceCode", invPlaceOrderDetailEntity.getInvSpaceCode());
// }
//
// //拆解出来的明细有就更新没有就添加
// InvPreInProductDetailEntity invPreInProductDetailEntity1 = invPreInProductDetailDao.selectOne(ew);
// if (invPreInProductDetailEntity1 != null) {
// invPreInProductDetailEntity1.setCount(invPreInProductDetailEntity1.getCount() + 1);
// invPreInProductDetailEntity1.setInCount(invPreInProductDetailEntity1.getInCount() + 1);
// invPreInProductDetailEntity1.setReCount(invPreInProductDetailEntity1.getReCount() + reCount);
// invPreInProductDetailDao.updateById(invPreInProductDetailEntity1);
// } else {
// invPreInProductDetailEntity.setId(null);
// invPreInProductDetailEntity.setInCount(1);
// invPreInProductDetailEntity.setCount(1);
// invPreInProductDetailEntity.setReCount(reCount);
// invPreInProductDetailEntity.setOutCount(0);
// if (bindInvSpaceRequest.getType() == 3) {
// invPreInProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode());
// } else {
// invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode());
// }
// invPreInProductDetailDao.insert(invPreInProductDetailEntity);
// }
// }
// }
// }
//
//
// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
//
// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper<InvPlaceOrderDetailEntity>().eq("recordId", bindInvSpaceRequest.getOrderId()));
// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) {
//
// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) {
// //拆解库存表
// InvPreProductDetailEntity invPreInProductDetailEntity = new InvPreProductDetailEntity();
// QueryWrapper<InvPreProductDetailEntity> ew = new QueryWrapper<>();
// if (bindInvSpaceRequest.getType() == 3) {
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.last("limit 1");
// invPreInProductDetailEntity = invPreProductDetailDao.selectOne(ew);
// } else {
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", ""));
// ew.gt("inCount", 0);
// ew.last("limit 1");
// invPreInProductDetailEntity = invPreProductDetailDao.selectOne(ew);
// }
//
// if (invPreInProductDetailEntity.getInCount() > 0) {
// String nameCode = invPreInProductDetailEntity.getNameCode();
// int reCount = getActCount(nameCode);
// invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount() - 1);
// invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount() - 1);
// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount() - reCount);
// invPreProductDetailDao.updateById(invPreInProductDetailEntity);
//
// //如果库存为空就删了该数据
// if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0)
// && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) {
// invPreProductDetailDao.deleteById(invPreInProductDetailEntity);
// }
//
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode()).eq("mainAction", ConstantType.TYPE_PUT);
// ;
// if (bindInvSpaceRequest.getType() == 3) {
// ew.eq("invSpaceCode", bindInvSpaceRequest.getChangeSpaceCode());
// } else {
// ew.eq("invSpaceCode", invPlaceOrderDetailEntity.getInvSpaceCode());
// }
//
// InvPreProductDetailEntity invPreInProductDetailEntity1 = invPreProductDetailDao.selectOne(ew);
// if (invPreInProductDetailEntity1 != null) {
// invPreInProductDetailEntity1.setCount(invPreInProductDetailEntity1.getCount() + 1);
// invPreInProductDetailEntity1.setInCount(invPreInProductDetailEntity1.getInCount() + 1);
// invPreInProductDetailEntity1.setReCount(invPreInProductDetailEntity1.getReCount() + reCount);
// invPreProductDetailDao.updateById(invPreInProductDetailEntity1);
// } else {
// invPreInProductDetailEntity.setId(null);
// invPreInProductDetailEntity.setInCount(1);
// invPreInProductDetailEntity.setCount(1);
// invPreInProductDetailEntity.setOutCount(0);
// invPreInProductDetailEntity.setReCount(reCount);
// if (bindInvSpaceRequest.getType() == 3) {
// invPreInProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode());
// } else {
// invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode());
// }
// invPreProductDetailDao.insert(invPreInProductDetailEntity);
// }
// }
// }
// }
//
// } else {
// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper<InvPlaceOrderDetailEntity>().eq("recordId", bindInvSpaceRequest.getOrderId()));
// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) {
//
// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) {
// //拆解库存表
// InvProductDetailEntity invPreInProductDetailEntity = new InvProductDetailEntity();
// QueryWrapper<InvProductDetailEntity> ew = new QueryWrapper<>();
// if (bindInvSpaceRequest.getType() == 3) {
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.last("limit 1");
// invPreInProductDetailEntity = invProductDetailDao.selectOne(ew);
// } else {
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", ""));
// ew.gt("inCount", 0);
// ew.last("limit 1");
// invPreInProductDetailEntity = invProductDetailDao.selectOne(ew);
// }
// if (invPreInProductDetailEntity.getInCount() > 0) {
// String nameCode = invPreInProductDetailEntity.getNameCode();
// int reCount = getActCount(nameCode);
// invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount() - 1);
// invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount() - 1);
// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount() - reCount);
// invProductDetailDao.updateById(invPreInProductDetailEntity);
//
// //如果库存为空就删了该数据
// if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0)
// && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) {
// invProductDetailDao.deleteById(invPreInProductDetailEntity);
// }
//
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode()).eq("mainAction", ConstantType.TYPE_PUT);
// if (bindInvSpaceRequest.getType() == 3) {
// ew.eq("invSpaceCode", bindInvSpaceRequest.getChangeSpaceCode());
// } else {
// ew.eq("invSpaceCode", invPlaceOrderDetailEntity.getInvSpaceCode());
// }
//
// InvProductDetailEntity invPreInProductDetailEntity1 = invProductDetailDao.selectOne(ew);
// if (invPreInProductDetailEntity1 != null) {
// invPreInProductDetailEntity1.setCount(invPreInProductDetailEntity1.getCount() + 1);
// invPreInProductDetailEntity1.setInCount(invPreInProductDetailEntity1.getInCount() + 1);
// invPreInProductDetailEntity1.setReCount(invPreInProductDetailEntity1.getReCount() + reCount);
// invProductDetailDao.updateById(invPreInProductDetailEntity1);
// } else {
// invPreInProductDetailEntity.setId(null);
// invPreInProductDetailEntity.setInCount(1);
// invPreInProductDetailEntity.setCount(1);
// invPreInProductDetailEntity.setOutCount(0);
// invPreInProductDetailEntity.setReCount(reCount);
// if (bindInvSpaceRequest.getType() == 3) {
// invPreInProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode());
// } else {
// invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode());
// }
// invProductDetailDao.insert(invPreInProductDetailEntity);
// }
// }
// }
// }
//
// }
// int total = invPlaceOrderDetailEntityList.stream().mapToInt(InvPlaceOrderDetailEntity::getCount).sum();
// QueryWrapper<InvPlaceOrderEntity> ew = new QueryWrapper<>();
// ew.eq("recordId", bindInvSpaceRequest.getOrderId());
// InvPlaceOrderEntity invPlaceOrderEntity = new InvPlaceOrderEntity();
// invPlaceOrderEntity.setRecordId(bindInvSpaceRequest.getOrderId());
// invPlaceOrderEntity.setCount(total);
// invPlaceOrderDao.update(invPlaceOrderEntity, ew);
//
//// if (CollUtil.isNotEmpty(list)) {
//// List<Integer> ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList());
//// log.info("本次绑定货位的库存详情数量为：{} 条", ids.size());
////
////
//// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
//// invPreInProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode());
//// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
//// invPreProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode());
//// } else {
//// invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode());
//// }
////
////
//// //添加物资上架记录
//// AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest();
//// addInvPlaceOrderRequest.setType(bindInvSpaceRequest.getType());
//// addInvPlaceOrderRequest.setOrderId(bindInvSpaceRequest.getOrderId());
//// addInvPlaceOrderRequest.setCodeList(list);
//// addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode());
//// addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
//// invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest);
//// return ResultVOUtils.success("绑定成功！本次绑定货位的库存详情数量为：" + ids.size() + "条");
//// } else {
//// log.info("绑定货位列表查询无数据");
//// return ResultVOUtils.error(500, "绑定货位列表查询无数据");
//// }
// return ResultVOUtils.success();
}
@Override
public BaseResponse bindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest) {
//查询仓库的部门ID
// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
List<InvPlaceOrderDetailEntity> invPlaceOrderDetailEntityList = new ArrayList<>();
@ -378,78 +126,6 @@ public class InvPlaceServiceImpl implements InvPlaceService {
return ResultVOUtils.success();
}
// @Override
// public BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest) {
// //查询仓库的部门ID
// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
//
// List<InvProductDetailEntity> list = new ArrayList<>();
// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
// List<InvPreInProductDetailEntity> invPreInProductDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>()
// .select("id", "code", "relId", "batchNo")
// .eq("deptCode", deptCode)
// .eq("invCode", bindInvSpaceRequest.getInvCode())
// .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
// .in("code", bindInvSpaceRequest.getCodeArray())
// );
// for (InvPreInProductDetailEntity invPreInProductDetailEntity : invPreInProductDetailEntities) {
// InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
// BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity);
// list.add(invProductDetailEntity);
// }
// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
//
// List<InvPreProductDetailEntity> invPreProductDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>()
// .select("id", "code", "relId", "batchNo")
// .eq("deptCode", deptCode)
// .eq("invCode", bindInvSpaceRequest.getInvCode())
// .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
// .in("code", bindInvSpaceRequest.getCodeArray())
// );
// for (InvPreProductDetailEntity invPreInProductDetailEntity : invPreProductDetailEntities) {
// InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
// BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity);
// list.add(invProductDetailEntity);
// }
//
// } else {
// list = invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>()
// .select("id", "code", "relId", "batchNo")
// .eq("deptCode", deptCode)
// .eq("invCode", bindInvSpaceRequest.getInvCode())
// .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
// .in("code", bindInvSpaceRequest.getCodeArray())
// );
// }
//
// if (CollUtil.isNotEmpty(list)) {
// List<Integer> ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList());
// log.info("本次更换货位的库存详情数量为：{} 条", ids.size());
//
// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
// invPreInProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
// invPreProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
// } else {
// invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
// }
//
//
// //添加物资上架记录
// AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest();
// addInvPlaceOrderRequest.setType(bindInvSpaceRequest.getType());
// addInvPlaceOrderRequest.setOrderId(bindInvSpaceRequest.getOrderId());
// addInvPlaceOrderRequest.setCodeList(list);
// addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode());
// addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
// invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest);
// return ResultVOUtils.success("绑定成功！本次绑定货位的库存详情数量为：" + ids.size() + "条");
// } else {
// log.info("绑定货位列表查询无数据");
// return ResultVOUtils.error(500, "绑定货位列表查询无数据");
// }
// }
@Override
public BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest) {
@ -468,18 +144,6 @@ public class InvPlaceServiceImpl implements InvPlaceService {
return ResultVOUtils.success();
}
@Override
public List<InvPlaceDetailResponse> getInvProductInfo(BindInvSpaceRequest bindInvSpaceRequest) {
return null;
//
// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper<InvWarehouseEntity>().eq("code", filterInvPlaceRequest.getInvCode()));
// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
// return invPreInProductDetailDao.getInvProductInfo(filterInvPlaceRequest);
// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
// return invPreProductDetailDao.getInvProductInfo(filterInvPlaceRequest);
// } else
// return invProductDetailDao.getInvProductInfo(filterInvPlaceRequest);
}
@Override
public List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest) {
@ -600,500 +264,17 @@ public class InvPlaceServiceImpl implements InvPlaceService {
return "";
}
//TODO 20241017 下架货物先注释
//TODO 20241017 下架货物先注释（后面可能要重新）
@Override
public String checkOutCount(BindInvSpaceRequest bindInvSpaceRequest) {
return null;
// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper<InvWarehouseEntity>().eq("code", bindInvSpaceRequest.getInvCode()));
// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
// QueryWrapper<InvPreInProductDetailEntity> ew = new QueryWrapper<>();
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.eq("code", bindInvSpaceRequest.getCode());
// ew.select("count");
// ew.last("limit 1");
// InvPreInProductDetailEntity invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
// if (invPreInProductDetailEntity==null || invPreInProductDetailEntity.getCount() <= 0) {
// return "该产品没存在该货架上！";
// }
// if (StrUtil.isNotBlank(bindInvSpaceRequest.getOrderId())) {
// QueryWrapper ew1 = new QueryWrapper();
// ew1.eq("recordId", bindInvSpaceRequest.getOrderId());
// ew1.eq("code", bindInvSpaceRequest.getCode());
// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1);
// if (invPlaceOrderDetailEntity == null) {
// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity();
// invPlaceOrderDetailEntity.setCount(0);
// }
// if (invPlaceOrderDetailEntity.getCount() >= invPreInProductDetailEntity.getCount()) {
// return "该产品库存不足！";
// }
// }
// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
// QueryWrapper<InvPreProductDetailEntity> ew = new QueryWrapper<>();
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.eq("code", bindInvSpaceRequest.getCode());
// ew.select("count");
// ew.last("limit 1");
// InvPreProductDetailEntity invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew);
// if (invPreProductDetailEntity==null || invPreProductDetailEntity.getCount() <= 0) {
// return "该产品没存在该货架上！";
// }
// if (StrUtil.isNotBlank(bindInvSpaceRequest.getOrderId())) {
// QueryWrapper ew1 = new QueryWrapper();
// ew1.eq("recordId", bindInvSpaceRequest.getOrderId());
// ew1.eq("code", bindInvSpaceRequest.getCode());
// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1);
// if (invPlaceOrderDetailEntity == null) {
// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity();
// invPlaceOrderDetailEntity.setCount(0);
// }
// if (invPlaceOrderDetailEntity.getCount() >= invPreProductDetailEntity.getCount()) {
// return "该产品库存不足！";
// }
// }
// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_NORMAL) {
// QueryWrapper<InvProductDetailEntity> ew = new QueryWrapper<>();
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.eq("code", bindInvSpaceRequest.getCode());
// ew.select("count");
// ew.last("limit 1");
// InvProductDetailEntity invProductDetailEntity = invProductDetailDao.selectOne(ew);
// if (invProductDetailEntity==null || invProductDetailEntity.getCount() <= 0) {
// return "该产品没存在该货架上！";
// }
// if (StrUtil.isNotBlank(bindInvSpaceRequest.getOrderId())) {
// QueryWrapper ew1 = new QueryWrapper();
// ew1.eq("recordId", bindInvSpaceRequest.getOrderId());
// ew1.eq("code", bindInvSpaceRequest.getCode());
// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1);
// if (invPlaceOrderDetailEntity == null) {
// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity();
// invPlaceOrderDetailEntity.setCount(0);
// }
// if (invPlaceOrderDetailEntity.getCount() >= invProductDetailEntity.getCount()) {
// return "该产品库存不足！";
// }
// }
// }
// return "";
}
public int getActCount(String nameCode) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(nameCode);
int count = getActCount(udiRelevanceResponse);
return count;
}
public int getActCount(UdiRelevanceResponse udiRelevanceResponse) {
int actCount;
if (!udiRelevanceResponse.getUseDy() && (udiRelevanceResponse.getDiType() == null || udiRelevanceResponse.getDiType() != 2)) {
if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
actCount = udiRelevanceResponse.getZxxsbzbhsydysl();
} else {
if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
udiRelevanceResponse.setBhzxxsbzsl(1);
}
if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) {
udiRelevanceResponse.setZxxsbzbhsydysl(1);
}
actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl();
}
} else {
actCount = udiRelevanceResponse.getBhzxxsbzsl();
}
return actCount;
}
//TODO 20241017 下架货位接口先注释
//TODO 20241017 下架货位接口先注释（后面可能要重新）
@Override
public BaseResponse unbindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest) {
return null;
// //查询仓库的部门ID
//// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
// List<InvPlaceOrderDetailEntity> invPlaceOrderDetailEntityList = new ArrayList<>();
// int total = 0;
// if (bindInvSpaceRequest.getOutCount() > 0) {
// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper<InvPlaceOrderDetailEntity>().eq("recordId", bindInvSpaceRequest.getOrderId()));
// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) {
//
// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) {
// //去掉库存
// QueryWrapper<InvPreInProductDetailEntity> ew = new QueryWrapper<>();
// InvPreInProductDetailEntity invPreInProductDetailEntity = new InvPreInProductDetailEntity();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.gt("inCount", 0);
// ew.last("limit 1");
// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
//
//
// if (invPreInProductDetailEntity.getInCount() > 0) {
// String nameCode = invPreInProductDetailEntity.getNameCode();
// int reCount = getActCount(nameCode);
// invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount() - 1);
// invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount() - 1);
// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount() - reCount);
// invPreInProductDetailDao.updateById(invPreInProductDetailEntity);
//
// //如果库存为空就删了该数据
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.last("limit 1");
// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
// if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0)
// && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) {
// invPreInProductDetailDao.deleteById(invPreInProductDetailEntity);
// }
//
//
// //如果有存在数据就加没有就新建
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", ""));
// ew.last("limit 1");
// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
// if (invPreInProductDetailEntity != null) {
// nameCode = invPreInProductDetailEntity.getNameCode();
// reCount = getActCount(nameCode);
// invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount() + 1);
// invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount() + 1);
// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount() + reCount);
// invPreInProductDetailDao.updateById(invPreInProductDetailEntity);
// } else {
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.last("limit 1");
// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
// invPreInProductDetailEntity.setId(null);
// invPreInProductDetailEntity.setInvSpaceCode("");
// invPreInProductDetailEntity.setInCount(1);
// invPreInProductDetailEntity.setCount(1);
// invPreInProductDetailEntity.setReCount(reCount);
// invPreInProductDetailEntity.setOutCount(0);
// invPreInProductDetailDao.insert(invPreInProductDetailEntity);
// }
// //如果库存为空就删了该数据
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.last("limit 1");
// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
// if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0)
// && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) {
// invPreInProductDetailDao.deleteById(invPreInProductDetailEntity);
// }
// }
// }
// }
// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
//
// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper<InvPlaceOrderDetailEntity>().eq("recordId", bindInvSpaceRequest.getOrderId()));
// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) {
//
// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) {
// //去掉库存
// QueryWrapper<InvPreProductDetailEntity> ew = new QueryWrapper<>();
// InvPreProductDetailEntity invPreProductDetailEntity = new InvPreProductDetailEntity();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.gt("inCount", 0);
// ew.last("limit 1");
// invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew);
//
//
// if (invPreProductDetailEntity.getInCount() > 0) {
// String nameCode = invPlaceOrderDetailEntity.getNameCode();
// int reCount = getActCount(nameCode);
// invPreProductDetailEntity.setInCount(invPreProductDetailEntity.getInCount() - 1);
// invPreProductDetailEntity.setCount(invPreProductDetailEntity.getCount() - 1);
// invPreProductDetailEntity.setReCount(invPreProductDetailEntity.getReCount() - reCount);
// invPreProductDetailDao.updateById(invPreProductDetailEntity);
//
//
//
// //如果有存在数据就加没有就新建
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", ""));
// ew.last("limit 1");
// invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew);
// if (invPreProductDetailEntity != null) {
// nameCode = invPreProductDetailEntity.getNameCode();
// reCount = getActCount(nameCode);
// invPreProductDetailEntity.setInCount(invPreProductDetailEntity.getInCount() + 1);
// invPreProductDetailEntity.setCount(invPreProductDetailEntity.getCount() + 1);
// invPreProductDetailEntity.setReCount(invPreProductDetailEntity.getReCount() + reCount);
// invPreProductDetailDao.updateById(invPreProductDetailEntity);
// } else {
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.last("limit 1");
// invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew);
// invPreProductDetailEntity.setId(null);
// invPreProductDetailEntity.setInvSpaceCode("");
// invPreProductDetailEntity.setInCount(1);
// invPreProductDetailEntity.setCount(1);
// invPreProductDetailEntity.setReCount(reCount);
// invPreProductDetailEntity.setOutCount(0);
// invPreProductDetailDao.insert(invPreProductDetailEntity);
// }
// //如果库存为空就删了该数据
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.last("limit 1");
// invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew);
// if (invPreProductDetailEntity != null && invPreProductDetailEntity.getInCount() == 0 && (invPreProductDetailEntity.getOutCount() == null || invPreProductDetailEntity.getOutCount() == 0)
// && invPreProductDetailEntity.getCount() == 0 && invPreProductDetailEntity.getReCount() == 0) {
// invPreProductDetailDao.deleteById(invPreProductDetailEntity);
// }
// }
// }
// }
//
//
// } else {
// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper<InvPlaceOrderDetailEntity>().eq("recordId", bindInvSpaceRequest.getOrderId()));
// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) {
//
// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) {
// //去掉库存
// QueryWrapper<InvProductDetailEntity> ew = new QueryWrapper<>();
// InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.gt("inCount", 0);
// ew.last("limit 1");
// invProductDetailEntity = invProductDetailDao.selectOne(ew);
//
//
// if (invProductDetailEntity.getInCount() > 0) {
// String nameCode = invProductDetailEntity.getNameCode();
// int reCount = getActCount(nameCode);
// invProductDetailEntity.setInCount(invProductDetailEntity.getInCount() - 1);
// invProductDetailEntity.setCount(invProductDetailEntity.getCount() - 1);
// invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount);
// invProductDetailDao.updateById(invProductDetailEntity);
//
//
//
// //如果有存在数据就加没有就新建
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", ""));
// ew.last("limit 1");
// invProductDetailEntity = invProductDetailDao.selectOne(ew);
// if (invProductDetailEntity != null) {
// nameCode = invProductDetailEntity.getNameCode();
// reCount = getActCount(nameCode);
// invProductDetailEntity.setInCount(invProductDetailEntity.getInCount() + 1);
// invProductDetailEntity.setCount(invProductDetailEntity.getCount() + 1);
// invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() + reCount);
// invProductDetailDao.updateById(invProductDetailEntity);
// } else {
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.last("limit 1");
// invProductDetailEntity = invProductDetailDao.selectOne(ew);
// invProductDetailEntity.setId(null);
// invProductDetailEntity.setInvSpaceCode("");
// invProductDetailEntity.setInCount(1);
// invProductDetailEntity.setCount(1);
// invProductDetailEntity.setReCount(reCount);
// invProductDetailEntity.setOutCount(0);
// invProductDetailDao.insert(invProductDetailEntity);
// }
//
//
// //如果库存为空就删了该数据
// ew.clear();
// ew.eq("code", invPlaceOrderDetailEntity.getCode());
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// ew.last("limit 1");
// invProductDetailEntity = invProductDetailDao.selectOne(ew);
// if (invProductDetailEntity != null && invProductDetailEntity.getInCount() == 0 && (invProductDetailEntity.getOutCount() == null || invProductDetailEntity.getOutCount() == 0)
// && invProductDetailEntity.getCount() == 0 && invProductDetailEntity.getReCount() == 0) {
// invProductDetailDao.deleteById(invProductDetailEntity);
// }
// }
// }
// }
// }
// total = invPlaceOrderDetailEntityList.stream().mapToInt(InvPlaceOrderDetailEntity::getCount).sum();
// } else {
// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
//
// QueryWrapper<InvPreInProductDetailEntity> ew = new QueryWrapper<>();
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// InvPreInProductDetailEntity invPreInProductDetailEntity = new InvPreInProductDetailEntity();
// invPreInProductDetailEntity.setInvSpaceCode("");
// List<InvPreInProductDetailEntity> invProductDetailEntityList = invPreInProductDetailDao.selectList(ew);
// //操作人ID
// String userId = customerService.getUserIdStr();
// String recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd"));
// //插入主表
// InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity();
// orderEntity.setId(IdUtil.getSnowflakeNextId());
// orderEntity.setRecordId(recordId);
// orderEntity.setType(4);
// orderEntity.setCreateUser(userId);
// orderEntity.setCreateTime(new Date());
// orderEntity.setUpdateTime(new Date());
// invPlaceOrderDao.insert(orderEntity);
// for (InvPreInProductDetailEntity productDetailEntity : invProductDetailEntityList) {
// for (int i = 0; i < productDetailEntity.getCount(); i++) {
// //插入附表不存在就新增存在就更新
// QueryWrapper<InvPlaceOrderDetailEntity> ew1 = new QueryWrapper<>();
// ew1.eq("recordId", recordId);
// ew1.eq("code", productDetailEntity.getCode());
// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1);
// if (invPlaceOrderDetailEntity != null) {
// invPlaceOrderDetailEntity.setCount(invPlaceOrderDetailEntity.getCount() + 1);
// invPlaceOrderDetailDao.updateById(invPlaceOrderDetailEntity);
// } else {
// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity();
// invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId());
// invPlaceOrderDetailEntity.setRecordId(recordId);
// invPlaceOrderDetailEntity.setBatchNo(productDetailEntity.getBatchNo());
// invPlaceOrderDetailEntity.setRelId(productDetailEntity.getRelId() + "");
// invPlaceOrderDetailEntity.setNameCode(productDetailEntity.getNameCode());
// invPlaceOrderDetailEntity.setExpireDate(productDetailEntity.getExpireDate());
// invPlaceOrderDetailEntity.setProduceDate(productDetailEntity.getProduceDate());
// invPlaceOrderDetailEntity.setSupId(productDetailEntity.getSupId());
// invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode());
// invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
// invPlaceOrderDetailEntity.setCode(productDetailEntity.getCode());
// invPlaceOrderDetailEntity.setSerialNo(productDetailEntity.getSerialNo());
// invPlaceOrderDetailEntity.setCount(1);
// invPlaceOrderDetailDao.insert(invPlaceOrderDetailEntity);
// }
// total++;
// }
// }
// invPreInProductDetailDao.update(invPreInProductDetailEntity, ew);
// bindInvSpaceRequest.setOrderId(recordId);
// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
//
//
// QueryWrapper<InvPreProductDetailEntity> ew = new QueryWrapper<>();
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// InvPreProductDetailEntity invPreProductDetailEntity = new InvPreProductDetailEntity();
// invPreProductDetailEntity.setInvSpaceCode("");
// List<InvPreProductDetailEntity> invProductDetailEntityList = invPreProductDetailDao.selectList(ew);
// //操作人ID
// String userId = customerService.getUserIdStr();
// String recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd"));
// //插入主表
// InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity();
// orderEntity.setId(IdUtil.getSnowflakeNextId());
// orderEntity.setRecordId(recordId);
// orderEntity.setType(4);
// orderEntity.setCreateUser(userId);
// orderEntity.setCreateTime(new Date());
// orderEntity.setUpdateTime(new Date());
// invPlaceOrderDao.insert(orderEntity);
// for (InvPreProductDetailEntity productDetailEntity : invProductDetailEntityList) {
// for (int i = 0; i < productDetailEntity.getCount(); i++) {
// //插入附表不存在就新增存在就更新
// QueryWrapper<InvPlaceOrderDetailEntity> ew1 = new QueryWrapper<>();
// ew1.eq("recordId", recordId);
// ew1.eq("code", productDetailEntity.getCode());
// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1);
// if (invPlaceOrderDetailEntity != null) {
// invPlaceOrderDetailEntity.setCount(invPlaceOrderDetailEntity.getCount() + 1);
// invPlaceOrderDetailDao.updateById(invPlaceOrderDetailEntity);
// } else {
// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity();
// invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId());
// invPlaceOrderDetailEntity.setRecordId(recordId);
// invPlaceOrderDetailEntity.setBatchNo(productDetailEntity.getBatchNo());
// invPlaceOrderDetailEntity.setRelId(productDetailEntity.getRelId() + "");
// invPlaceOrderDetailEntity.setNameCode(productDetailEntity.getNameCode());
// invPlaceOrderDetailEntity.setExpireDate(productDetailEntity.getExpireDate());
// invPlaceOrderDetailEntity.setProduceDate(productDetailEntity.getProduceDate());
// invPlaceOrderDetailEntity.setSupId(productDetailEntity.getSupId());
// invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode());
// invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
// invPlaceOrderDetailEntity.setCode(productDetailEntity.getCode());
// invPlaceOrderDetailEntity.setSerialNo(productDetailEntity.getSerialNo());
// invPlaceOrderDetailEntity.setCount(1);
// invPlaceOrderDetailDao.insert(invPlaceOrderDetailEntity);
// }
// total++;
// }
// }
// invPreProductDetailDao.update(invPreProductDetailEntity, ew);
// bindInvSpaceRequest.setOrderId(recordId);
// } else {
//
// QueryWrapper<InvProductDetailEntity> ew = new QueryWrapper<>();
// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
// InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
// invProductDetailEntity.setInvSpaceCode("");
// List<InvProductDetailEntity> invProductDetailEntityList = invProductDetailDao.selectList(ew);
// //操作人ID
// String userId = customerService.getUserIdStr();
// String recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd"));
// //插入主表
// InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity();
// orderEntity.setId(IdUtil.getSnowflakeNextId());
// orderEntity.setRecordId(recordId);
// orderEntity.setType(4);
// orderEntity.setCreateUser(userId);
// orderEntity.setCreateTime(new Date());
// orderEntity.setUpdateTime(new Date());
// invPlaceOrderDao.insert(orderEntity);
// for (InvProductDetailEntity productDetailEntity : invProductDetailEntityList) {
// for (int i = 0; i < productDetailEntity.getCount(); i++) {
// //插入附表不存在就新增存在就更新
// QueryWrapper<InvPlaceOrderDetailEntity> ew1 = new QueryWrapper<>();
// ew1.eq("recordId", recordId);
// ew1.eq("code", productDetailEntity.getCode());
// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1);
// if (invPlaceOrderDetailEntity != null) {
// invPlaceOrderDetailEntity.setCount(invPlaceOrderDetailEntity.getCount() + 1);
// invPlaceOrderDetailDao.updateById(invPlaceOrderDetailEntity);
// } else {
// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity();
// invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId());
// invPlaceOrderDetailEntity.setRecordId(recordId);
// invPlaceOrderDetailEntity.setBatchNo(productDetailEntity.getBatchNo());
// invPlaceOrderDetailEntity.setRelId(productDetailEntity.getRelId() + "");
// invPlaceOrderDetailEntity.setNameCode(productDetailEntity.getNameCode());
// invPlaceOrderDetailEntity.setExpireDate(productDetailEntity.getExpireDate());
// invPlaceOrderDetailEntity.setProduceDate(productDetailEntity.getProduceDate());
// invPlaceOrderDetailEntity.setSupId(productDetailEntity.getSupId());
// invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode());
// invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
// invPlaceOrderDetailEntity.setCode(productDetailEntity.getCode());
// invPlaceOrderDetailEntity.setSerialNo(productDetailEntity.getSerialNo());
// invPlaceOrderDetailEntity.setCount(1);
// invPlaceOrderDetailDao.insert(invPlaceOrderDetailEntity);
// }
// total++;
// }
// }
// invProductDetailDao.update(invProductDetailEntity, ew);
// bindInvSpaceRequest.setOrderId(recordId);
//
//
// }
// }
//
//
// QueryWrapper<InvPlaceOrderEntity> ew = new QueryWrapper<>();
// ew.eq("recordId", bindInvSpaceRequest.getOrderId());
// InvPlaceOrderEntity invPlaceOrderEntity = new InvPlaceOrderEntity();
// invPlaceOrderEntity.setRecordId(bindInvSpaceRequest.getOrderId());
// invPlaceOrderEntity.setCount(total);
// invPlaceOrderDao.update(invPlaceOrderEntity, ew);
// return ResultVOUtils.success();
}

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

@ -156,11 +156,6 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
response.setOrderTime(MsDateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
}
@Override
public boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest) {
return invPreInProductDetailDao.deleteInvPreProductDetail(detailRequest);
}
@Override
public int findCountByCode(String code) {
List<InvPreInProductDetailEntity> invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>().eq("code", code));
@ -177,35 +172,6 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
return count;
}
@Override
public int findCountBySpaceCode(String spaceCode, String code) {
List<InvPreInProductDetailEntity> invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>().eq("code", code).eq("invSpaceCode", spaceCode));
int count = 0;
if (CollUtil.isNotEmpty(invPreinDetailEntities)) {
for (InvPreInProductDetailEntity invProductDetailEntity : invPreinDetailEntities) {
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT))
count = count + invProductDetailEntity.getReCount();
else {
count = count - invProductDetailEntity.getReCount();
}
}
}
return count;
}
@Override
public InvPreInProductDetailEntity findUseOneByCode(String code) {
List<InvPreInProductDetailEntity> invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>().eq("code", code)
.last("limit 1"));
if (CollUtil.isNotEmpty(invPreinDetailEntities)) {
return invPreinDetailEntities.get(0);
}
return null;
}
@Override
public int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode) {
@ -256,13 +222,12 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
@Override
public List<InvPlaceDetailResponse> findByGroupCode(String invCode, String code) {
List<InvPlaceDetailResponse> datas = null;
if (StrUtil.isNotEmpty(invCode) && StrUtil.isNotEmpty(code)) {
List<InvPlaceDetailResponse> datas =
invPreInProductDetailDao.findByGroupCode(invCode, code);
return datas;
datas = invPreInProductDetailDao.findByGroupCode(invCode, code);
}
return null;
return datas;
}
@Override

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

@ -158,31 +158,6 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
}
@Override
public int findCountByCode(String code) {
List<InvPreProductDetailEntity> invPreinDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>().eq("code", code));
int count = 0;
if (CollUtil.isNotEmpty(invPreinDetailEntities)) {
for (InvPreProductDetailEntity invProductDetailEntity : invPreinDetailEntities) {
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT))
count = count + invProductDetailEntity.getReCount();
else {
count = count - invProductDetailEntity.getReCount();
}
}
}
return count;
}
@Override
public InvPreProductDetailEntity findUseOneByCode(String code) {
List<InvPreProductDetailEntity> invPreinDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>().eq("code", code)
.last("limit 1"));
if (CollUtil.isNotEmpty(invPreinDetailEntities)) {
return invPreinDetailEntities.get(0);
}
return null;
}
@Override
public int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode) {
@ -209,36 +184,15 @@ 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(StrUtil.isNotEmpty(deptCode), "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) {
List<InvPlaceDetailResponse> datas = null;
if (StrUtil.isNotEmpty(invCode) && StrUtil.isNotEmpty(code)) {
List<InvPlaceDetailResponse> datas =
invPreProductDetailDao.findByGroupCode(invCode, code);
return datas;
datas = invPreProductDetailDao.findByGroupCode(invCode, code);
}
return null;
return datas;
}
}

31
src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java
Unescape Escape View File

@ -41,34 +41,11 @@ public class InvPreinDetailServiceImpl implements InvPreinDetailService {
invPreinDetailDao.insertBatch(invPreinDetailEntities);
}
@Override
public List<InvPreinDetailEntity> findUseByCode(String code) {
return invPreinDetailDao.selectList(new QueryWrapper<InvPreinDetailEntity>().eq("code", code).eq("status", ConstantStatus.INVIN_IN));
}
@Override
public InvPreinDetailEntity findUseOneByCode(String code) {
List<InvPreinDetailEntity> invPreinDetailEntities = invPreinDetailDao.selectList(new QueryWrapper<InvPreinDetailEntity>().eq("code", code)
.eq("status", ConstantStatus.INVIN_IN).last("limit 1"));
if (CollUtil.isNotEmpty(invPreinDetailEntities)) {
return invPreinDetailEntities.get(0);
}
return null;
}
@Override
public List<InvPreinDetailEntity> findByCode(String code) {
return invPreinDetailDao.selectList(new QueryWrapper<InvPreinDetailEntity>().eq("code", code));
}
//
// @Override
// public InvPreinDetailEntity findOneByCode(String code) {
// List<InvPreinDetailEntity> invPreinDetailEntities = invPreinDetailDao.selectList(new QueryWrapper<InvPreinDetailEntity>().eq("code", code).last("limit 1"));
// if (CollUtil.isNotEmpty(invPreinDetailEntities)) {
// return invPreinDetailEntities.get(0);
// }
// return null;
// }
@Override
public int deleteByOrderId(String orderId) {
@ -102,13 +79,5 @@ public class InvPreinDetailServiceImpl implements InvPreinDetailService {
return invPreinDetailDao.updateById(invPreinDetailEntity);
}
@Override
public int updateBack(String orderId) {
InvPreinDetailEntity invPreinDetailEntity = new InvPreinDetailEntity();
invPreinDetailEntity.setStatus(ConstantStatus.INVIN_BACK);
invPreinDetailDao.update(invPreinDetailEntity, new QueryWrapper<InvPreinDetailEntity>().eq("orderId", orderId).ne("status", ConstantStatus.INVIN_USE));
return 1;
}
}

15
src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java
Unescape Escape View File

@ -77,16 +77,6 @@ public class InvPreinProductServiceImpl implements InvPreinProductService {
return invPreinProductDao.filterListStock(invPreProductRequest);
}
@Override
public List<InvPreinProductEntity> filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest) {
if (null == invPreProductRequest) {
return Collections.emptyList();
}
if (null != invPreProductRequest.getPage() && null != invPreProductRequest.getLimit()) {
PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit());
}
return invPreinProductDao.filterPreProductList(invPreProductRequest);
}
@Override
public List<InvPreinProductResponse> findGroupBySpace(FilterInvPreinProductRequest invPreProductRequest) {
@ -106,10 +96,5 @@ public class InvPreinProductServiceImpl implements InvPreinProductService {
}
@Override
public boolean isExitByRelId(String relId) {
return invPreinProductDao.exists(new QueryWrapper<InvPreinProductEntity>().eq("relIdFk", relId));
}
}

5
src/main/java/com/glxp/api/service/inv/impl/InvProductService.java
Unescape Escape View File

@ -39,11 +39,6 @@ public class InvProductService extends ServiceImpl<InvProductDao, InvProductEnti
}
public boolean updateBatch(List<InvProductEntity> invProductEntities) {
return invProductDao.updateBatchById(invProductEntities);
}
public InvProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode, BigDecimal price) {
return invProductDao.selectOne(new QueryWrapper<InvProductEntity>().eq("relIdFk", relId)
.eq(StrUtil.isNotBlank(batchNo), "batchNo", batchNo).isNull(StrUtil.isEmpty(batchNo), "batchNo")

72
src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java
Unescape Escape View File

@ -48,17 +48,6 @@ public class InvProductServiceNew extends ServiceImpl<InvProductNewDao, InvProdu
@Resource
private UdiProductDao udiProductDao;
// public int insert(InvProductNewVo InvProductNewVo) {
// InvProductNewVo.setId(null);
// if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT)) {
// InvProductNewVo.setInCount(InvProductNewVo.getReCount());
// } else if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_OUT)) {
// InvProductNewVo.setOutCount(InvProductNewVo.getReCount());
// }
// return invProductNewDao.insert(InvProductNewVo);
// }
public List<InvProductNewVo> selectByOrderIdFk(String billNo) {
if (StrUtil.isEmpty(billNo))
return null;
@ -80,28 +69,6 @@ public class InvProductServiceNew extends ServiceImpl<InvProductNewDao, InvProdu
return null;
}
//
// public int deleteByOrderId(String billNo) {
// return invProductNewDao.delete(new QueryWrapper<InvProductNewVo>().eq("orderId", billNo));
// }
// public int deleteById(Integer id) {
// return invProductNewDao.deleteById(id);
// }
//
//
// public int update(InvProductNewVo InvProductNewVo) {
//
// if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT)) {
// InvProductNewVo.setInCount(InvProductNewVo.getReCount());
// } else if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_OUT)) {
// InvProductNewVo.setOutCount(InvProductNewVo.getReCount());
// }
//
// return invProductNewDao.updateById(InvProductNewVo);
// }
public List<InvProductNewVo> selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode) {
return invProductNewDao.selectList(new QueryWrapper<InvProductNewVo>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
@ -109,20 +76,6 @@ public class InvProductServiceNew extends ServiceImpl<InvProductNewDao, InvProdu
}
// public InvProductNewVo sortFindByCode(String code) {
// List<InvProductNewVo> invProductDetailEntities = invProductNewDao.selectList(new QueryWrapper<InvProductNewVo>().eq("code", code).orderByDesc("id"));
// if (CollUtil.isNotEmpty(invProductDetailEntities))
// return invProductDetailEntities.get(0);
// else
// return null;
// }
// public boolean insertList(List<InvProductNewVo> invProductDetailEntities) {
// return invProductNewDao.insertBatch(invProductDetailEntities);
// }
public List<InvProductNewVo> filterInvProductDetailList(FilterInvProductDetailRequest filterInvProductDetailRequest) {
if (null == filterInvProductDetailRequest) {
return Collections.emptyList();
@ -134,10 +87,6 @@ public class InvProductServiceNew extends ServiceImpl<InvProductNewDao, InvProdu
}
// public boolean deleteInvProductDetail(FilterInvProductDetailRequest detailRequest) {
// return invProductNewDao.deleteInvProductDetail(detailRequest);
// }
@Resource
InvSpaceService invSpaceService;
@ -220,27 +169,6 @@ public class InvProductServiceNew extends ServiceImpl<InvProductNewDao, InvProdu
}
// public int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code) {
// List<InvProductNewVo> datas =
// invProductNewDao.selectList(new QueryWrapper<InvProductNewVo>().eq("deptCode", deptCode).eq("invCode", invCode)
// .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
// .eq("code", code)
// );
//
// int count = 0;
// if (CollUtil.isNotEmpty(datas)) {
// for (InvProductNewVo InvProductNewVo : datas) {
// if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT))
// count = count + InvProductNewVo.getReCount();
// else {
// count = count - InvProductNewVo.getReCount();
// }
// }
// }
// return count;
// }
public List<InvPlaceDetailResponse> findByGroupCode(String invCode, String code, Boolean isCheckSpace) {
if (StrUtil.isNotEmpty(invCode) && StrUtil.isNotEmpty(code)) {
List<InvPlaceDetailResponse> datas =

19
src/main/java/com/glxp/api/service/inv/impl/InvUserProductDetailServiceImpl.java
Unescape Escape View File

@ -20,28 +20,9 @@ public class InvUserProductDetailServiceImpl implements InvUserProductDetailServ
@Resource
InvUserProductDetailDao invUserProductDetailDao;
@Override
public List<InvUserProductDetailEntity> filterInvUserProductDetailList(InvUserProductDetailEntity invUserProductDetailEntity) {
return null;
}
@Override
public Boolean addInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) {
return invUserProductDetailDao.insert(invUserProductDetailEntity) == 1 ? true : false;
}
@Override
public Boolean addInvUserProductDetailList(List<InvUserProductDetailEntity> invUserProductDetailEntityList) {
return invUserProductDetailDao.insertBatch(invUserProductDetailEntityList);
}
@Override
public Boolean updateInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) {
return invUserProductDetailDao.updateById(invUserProductDetailEntity) == 1 ? true : false;
}
@Override
public Boolean delectInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) {
return invUserProductDetailDao.deleteById(invUserProductDetailEntity) == 1 ? true : false;
}
}

10
src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java
Unescape Escape View File

@ -23,11 +23,6 @@ public class InvUserProductServiceImpl implements InvUserProductService {
@Resource
InvUserProductDao invUserProductDao;
@Override
public List<InvUserProductEntity> filterInvUserProductList(InvUserProductEntity invUserProductEntity) {
return null;
}
@Override
public Boolean addInvUserProduct(InvUserProductEntity invUserProductEntity) {
return invUserProductDao.insert(invUserProductEntity) == 1 ? true : false;
@ -38,11 +33,6 @@ public class InvUserProductServiceImpl implements InvUserProductService {
return invUserProductDao.updateById(invUserProductEntity) == 1 ? true : false;
}
@Override
public Boolean delectInvUserProduct(InvUserProductEntity invUserProductEntity) {
return invUserProductDao.deleteById(invUserProductEntity) == 1 ? true : false;
}
@Override
public InvUserProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode,String userId,Integer type) {
return invUserProductDao.selectOne(new QueryWrapper<InvUserProductEntity>().eq("relIdFk", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)

4
src/main/java/com/glxp/api/service/inv/impl/StockCompareDetailServiceImpl.java
Unescape Escape View File

@ -27,10 +27,6 @@ public class StockCompareDetailServiceImpl extends CustomServiceImpl<StockCompar
return super.baseMapper.invProductDetailSelectPage(query.getPageObj(), query);
}
@Override
public List<StockCompareDetailResponse> filterCompareDetail(InvProductDetailSelectRequest invProductDetailSelectRequest) {
return super.baseMapper.filterCompareDetail(invProductDetailSelectRequest);
}
}

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

@ -279,7 +279,6 @@ public class StockCompareServiceImpl extends CustomServiceImpl<StockCompareMappe
.thrPrice(null)
.build();
stockCompareDetailEntities.add(stockCompareDetailEntity);
// mapDetail.put(stockCompareDetailEntity.getProductId() + stockCompareDetailEntity.getBatchNo(), stockCompareDetailEntity);
}
}
for (InvCpThrProuductEntity invCpThrProuductEntity : invCpThrProuductEntities) {
@ -302,7 +301,6 @@ public class StockCompareServiceImpl extends CustomServiceImpl<StockCompareMappe
.thrPrice(invCpThrProuductEntity.getPrice())
.build();
stockCompareDetailEntities.add(stockCompareDetailEntity);
// mapDetail.put(stockCompareDetailEntity.getProductId() + stockCompareDetailEntity.getBatchNo(), stockCompareDetailEntity);
}
}

9
src/main/java/com/glxp/api/service/monitor/ISysOperLogService.java
Unescape Escape View File

@ -22,7 +22,7 @@ public interface ISysOperLogService {
/**
* 查询系统操作日志集合
*
* @param operLog 操作日志对象
* @param filterOperLogRequest 操作日志对象
* @return 操作日志集合
*/
List<SysOperLog> selectOperLogList(FilterOperLogRequest filterOperLogRequest);
@ -35,12 +35,5 @@ public interface ISysOperLogService {
*/
int deleteOperLogByIds(Long[] operIds);
/**
* 查询操作日志详细
*
* @param operId 操作ID
* @return 操作日志对象
*/
SysOperLog selectOperLogById(Long operId);
}

4
src/main/java/com/glxp/api/service/purchase/CustomerContactService.java
Unescape Escape View File

@ -11,15 +11,11 @@ import java.util.List;
public interface CustomerContactService {
List<CustomerContactEntity> filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest);
boolean insertCustomerContact(CustomerContactEntity customerContactEntity);
boolean updateCustomerContact(CustomerContactEntity customerContactEntity);
boolean deleteById(String id);
boolean deleteContact(DeleteRequest deleteRequest);
CustomerContactEntity selectById(Long emailId);
}

7
src/main/java/com/glxp/api/service/purchase/SupCertService.java
Unescape Escape View File

@ -15,8 +15,6 @@ public interface SupCertService extends IService<SupCertEntity> {
List<SupCertEntity> filterCompanyCert(FilterSupCertRequest filterSupCertRequest);
SupCertEntity findCompanyCertByName(String name);
List<SupCertEntity> findAll(String customerId);
List<SupCertEntity> findAll(String customerId, String manufacturerId);
@ -40,11 +38,6 @@ public interface SupCertService extends IService<SupCertEntity> {
boolean deleteById(String id);
boolean deleteByCustomerId(String customerId);
boolean delManufacturerId(String customerId, String manufacturerId);
boolean delProductId(String customerId, String manufacturerId, String productId);
List<SupCertEntity> selectSupCertList(purPlanPrintRequest purPlanPrintRequest);

8
src/main/java/com/glxp/api/service/purchase/SupCompanyService.java
Unescape Escape View File

@ -10,18 +10,10 @@ import java.util.List;
public interface SupCompanyService extends IService<SupCompanyEntity> {
SupCompanyEntity findCompanyByUnitFk(String unitFk);
List<SupCompanyEntity> filterCompany(FilterSupCompanyRequest companyRequest);
SupCompanyEntity findCompany(String CustomerId);
List<SupCompanyEntity> getSubCompany(FilterSupCompanyRequest commitRequest);
List<SupCompanyEntity> getSubCompany2(FilterSupCompanyRequest commitRequest);
SupCompanyEntity findCompanyByName(String companyName);
boolean modifyCompany(SupCompanyEntity companyEntity);
boolean insertCompany(SupCompanyEntity companyEntity);

3
src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java
Unescape Escape View File

@ -13,9 +13,6 @@ public interface SupManufacturerService extends IService<SupManufacturerEntity>
SupManufacturerEntity findManufacturer(String manufacturerId);
SupManufacturerEntity findCompanyByName(String companyName);
List<SupManufacturerEntity> getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest);
boolean modifyCompany(SupManufacturerEntity supManufacturerEntity);

13
src/main/java/com/glxp/api/service/purchase/SupProductService.java
Unescape Escape View File

@ -15,21 +15,10 @@ public interface SupProductService extends IService<SupProductEntity> {
SupProductResponse findByProductId(String productId);
SupProductEntity findByRelIdFk(String relIdFk);
SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk);
SupProductResponse findByPassByReCert(String registerCert);
SupProductResponse findJoinRegistration(Long id);
SupProductEntity findRegistrationByName(String recordProductName);
List<SupProductResponse> getRegistration(FilterPoductRequest filterPoductRequest);
List<SupProductEntity> filterProducts(FilterPoductRequest filterPoductRequest);
boolean modifyRegistration(SupProductEntity supProductEntity);
boolean insertRegistration(SupProductEntity supProductEntity);
@ -38,8 +27,6 @@ public interface SupProductService extends IService<SupProductEntity> {
boolean deleteById(@Param("id") String id);
boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId);
SupProductEntity findExitByManufactury(String cpmctymc, String manufactory, String customerId);
}

18
src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java
Unescape Escape View File

@ -17,20 +17,8 @@ import java.util.List;
@Transactional(rollbackFor = Exception.class)
public class CustomerContactServiceImpl implements CustomerContactService {
@Resource
private CustomerContacDao customerContacDao;
@Override
public List<CustomerContactEntity> filterCustomerContact(CustomerContactFilterRequest customerContactFilterRequest) {
if (customerContactFilterRequest == null) {
return Collections.emptyList();
}
int offset = (customerContactFilterRequest.getPage() - 1) * customerContactFilterRequest.getLimit();
PageHelper.offsetPage(offset, customerContactFilterRequest.getLimit());
return customerContacDao.filterCustomerContact(customerContactFilterRequest);
}
@Override
public boolean insertCustomerContact(CustomerContactEntity customerContactEntity) {
return customerContacDao.insertCustomerContact(customerContactEntity);
@ -46,12 +34,6 @@ public class CustomerContactServiceImpl implements CustomerContactService {
return customerContacDao.deleteById(id);
}
@Override
public boolean deleteContact(DeleteRequest deleteRequest) {
return customerContacDao.deleteContact(deleteRequest);
}
@Override
public CustomerContactEntity selectById(Long emailId) {
return customerContacDao.selectById(emailId);

18
src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java
Unescape Escape View File

@ -60,24 +60,6 @@ public class PurContractService extends ServiceImpl<PurContractMapper, PurContra
List<PurContractEntityResponse> data = purContractMapper.selectPage(purContractRequest);
return data;
}
//
// /**
// * 构造查询条件
// *
// * @param purContractRequest
// * @return
// */
// private QueryWrapper<PurContractEntity> buildPurContractQueryWrapper(PurContractRequest purContractRequest) {
// QueryWrapper<PurContractEntity> wrapper = new QueryWrapper<>();
// wrapper.like(StrUtil.isNotBlank(purContractRequest.getCode()), "code", purContractRequest.getCode())
// .like(StrUtil.isNotBlank(purContractRequest.getName()), "name", purContractRequest.getName())
// .eq(ObjectUtil.isNotNull(purContractRequest.getStatus()), "status", purContractRequest.getStatus())
// .ge(StrUtil.isNotBlank(purContractRequest.getStartDate()), "contractDate", purContractRequest.getStartDate())
// .le(StrUtil.isNotBlank(purContractRequest.getEndDate()), "contractDate", purContractRequest.getEndDate())
// .orderByDesc("id");
// return wrapper;
// }
public int insert(PurContractEntity purContractEntity) {
return purContractMapper.insert(purContractEntity);
}

2
src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemDetailService.java
Unescape Escape View File

@ -65,8 +65,6 @@ public class PurInquiryItemDetailService extends ServiceImpl<PurInquiryItemDetai
purInquiryItemDetailEntity.setSupName(x.getName());
purInquiryItemDetailEntity.setSupPerson(x.getContact());
purInquiryItemDetailEntity.setSupPhone(x.getMobile());
// purInquiryItemDetailEntity.setSupEmail(x.getAddr());
list.add(purInquiryItemDetailEntity);
});
});

2
src/main/java/com/glxp/api/service/purchase/impl/PurInquiryOfferItemDetailService.java
Unescape Escape View File

@ -65,8 +65,6 @@ public class PurInquiryOfferItemDetailService extends ServiceImpl<PurInquiryOffe
purInquiryOfferItemDetailEntity.setSupName(x.getName());
purInquiryOfferItemDetailEntity.setSupPerson(x.getContact());
purInquiryOfferItemDetailEntity.setSupPhone(x.getMobile());
// purInquiryOfferItemDetailEntity.setSupEmail(x.getAddr());
list.add(purInquiryOfferItemDetailEntity);
});
});

12
src/main/java/com/glxp/api/service/purchase/impl/PurInquiryOfferService.java
Unescape Escape View File

@ -34,10 +34,6 @@ public class PurInquiryOfferService extends ServiceImpl<PurInquiryOfferMapper, P
CustomerService customerService;
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
SysApprovalFlowService sysApprovalFlowService;
final String type_xjbj = "xjbj";
@Resource
PurInquiryOfferItemService purInquiryOfferItemService;
@ -73,14 +69,6 @@ public class PurInquiryOfferService extends ServiceImpl<PurInquiryOfferMapper, P
String billNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean("XJBJ", "yyyyMMdd"));
purInquiryOfferEntity.setBillNo(billNo);
purInquiryOfferEntity.setApprovalFlowId(null);
// Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
// if (sys_approval_flow){//提交审核
// String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
// purInquiryOfferEntity.setApprovalFlowId(approvalFlowId);
// sysApprovalFlowService.generateFlow(approvalFlowId,purInquiryOfferEntity.getBillNo(),type_xjbj);
// }
purInquiryOfferEntity.setCreateTime(date);
purInquiryOfferEntity.setCreateUser(userId + "");
purInquiryOfferEntity.setPlanBillNo(purInquiryEntity.getBillNo());

3
src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java
Unescape Escape View File

@ -28,9 +28,6 @@ import java.util.List;
@Transactional(rollbackFor = Exception.class)
public class PurOrderServiceImpl implements PurOrderService {
@Resource
PurPlanDao purPlanDao;
@Resource
PurOrderDao purOrderDao;

33
src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java
Unescape Escape View File

@ -137,39 +137,6 @@ public class SupCertServiceImpl extends ServiceImpl<SupCertDao, SupCertEntity> i
return supCertDao.deleteById(id);
}
@Override
public boolean deleteByCustomerId(String customerId) {
if (StrUtil.isNotEmpty(customerId)) {
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(customerId);
return supCertDao.deleteCert(filterSupCertRequest);
}
return false;
}
@Override
public boolean delManufacturerId(String customerId, String manufacturerId) {
if (StrUtil.isNotEmpty(customerId) && StrUtil.isNotEmpty(manufacturerId)) {
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(customerId);
filterSupCertRequest.setManufacturerIdFk(manufacturerId);
return supCertDao.deleteCert(filterSupCertRequest);
}
return false;
}
@Override
public boolean delProductId(String customerId, String manufacturerId, String productId) {
if (StrUtil.isNotEmpty(customerId) && StrUtil.isNotEmpty(manufacturerId) && StrUtil.isNotEmpty(productId)) {
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(customerId);
filterSupCertRequest.setManufacturerIdFk(manufacturerId);
filterSupCertRequest.setProductIdFk(productId);
return supCertDao.deleteCert(filterSupCertRequest);
}
return false;
}
@Override
public List<SupCertEntity> selectSupCertList(purPlanPrintRequest purPlanPrintRequest) {

39
src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java
Unescape Escape View File

@ -20,16 +20,6 @@ public class SupCompanyServiceImpl extends ServiceImpl<SupCompanyDao,SupCompanyE
@Resource
SupCompanyDao supCompanyDao;
@Override
public SupCompanyEntity findCompanyByUnitFk(String unitFk) {
FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest();
filterSupCompanyRequest.setUnitIdFk(unitFk);
List<SupCompanyEntity> companyEntities = supCompanyDao.filterCompany(filterSupCompanyRequest);
if (companyEntities != null && companyEntities.size() > 0) {
return companyEntities.get(0);
}
return null;
}
@Override
public List<SupCompanyEntity> filterCompany(FilterSupCompanyRequest companyRequest) {
@ -48,35 +38,6 @@ public class SupCompanyServiceImpl extends ServiceImpl<SupCompanyDao,SupCompanyE
return supCompanyDao.findCompany(CustomerId);
}
@Override
public List<SupCompanyEntity> getSubCompany(FilterSupCompanyRequest commitRequest) {
if (commitRequest == null) {
return Collections.emptyList();
}
if (commitRequest.getPage() != null) {
int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit();
PageHelper.offsetPage(offset, commitRequest.getLimit());
}
List<SupCompanyEntity> companyEntities = supCompanyDao.getSubCompany(commitRequest);
return companyEntities;
}
@Override
public List<SupCompanyEntity> getSubCompany2(FilterSupCompanyRequest commitRequest) {
if (commitRequest == null) {
return Collections.emptyList();
}
int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit();
PageHelper.offsetPage(offset, commitRequest.getLimit());
List<SupCompanyEntity> companyEntities = supCompanyDao.getSubCompany2(commitRequest);
return companyEntities;
}
@Override
public SupCompanyEntity findCompanyByName(String companyName) {
return supCompanyDao.findCompanyByName(companyName);
}
@Override
public boolean modifyCompany(SupCompanyEntity companyEntity) {

5
src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java
Unescape Escape View File

@ -27,11 +27,6 @@ public class SupManufacturerServiceImpl extends ServiceImpl<SupManufacturerDao,
return supManufacturerDao.findCompany(id);
}
@Override
public SupManufacturerEntity findCompanyByName(String companyName) {
return supManufacturerDao.findCompanyByName(companyName);
}
@Override
public SupManufacturerEntity findManufacturer(String manufacturerId) {

58
src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java
Unescape Escape View File

@ -30,33 +30,6 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
return supProductDao.findRegistration(id);
}
@Override
public SupProductResponse findJoinRegistration(Long id) {
if (id == null)
return null;
FilterPoductRequest filterPoductRequest = new FilterPoductRequest();
filterPoductRequest.setId(id);
List<SupProductResponse> companyEntities = supProductDao.getRegistration(filterPoductRequest);
if (CollUtil.isNotEmpty(companyEntities))
return companyEntities.get(0);
return null;
}
@Override
public SupProductResponse findByPassByReCert(String registerCert) {
if (StrUtil.isEmpty(registerCert))
return null;
FilterPoductRequest filterPoductRequest = new FilterPoductRequest();
filterPoductRequest.setRecordCode(registerCert);
filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
List<SupProductResponse> supProductEntities = supProductDao.getRegistration(filterPoductRequest);
if (CollUtil.isNotEmpty(supProductEntities))
return supProductEntities.get(0);
return null;
}
@Override
public SupProductResponse findByProductId(String productId) {
@ -71,16 +44,6 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
return null;
}
@Override
public SupProductEntity findByRelIdFk(String relIdFk) {
List<SupProductEntity> supProductEntities = supProductDao.selectList(new QueryWrapper<SupProductEntity>().eq("relIdFk", relIdFk)
.and(tmp -> tmp.eq("auditStatus", ConstantStatus.AUDIT_PASS).or().eq("auditStatus", ConstantStatus.AUDIT_PASS))
.last("LIMIT 1"));
if (CollUtil.isNotEmpty(supProductEntities))
return supProductEntities.get(0);
else return null;
}
@Override
public SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk) {
@ -102,10 +65,6 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
else return null;
}
@Override
public SupProductEntity findRegistrationByName(String recordProductName) {
return supProductDao.findRegistrationByName(recordProductName);
}
@Override
public List<SupProductResponse> getRegistration(FilterPoductRequest filterPoductRequest) {
@ -120,18 +79,6 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
return companyEntities;
}
@Override
public List<SupProductEntity> filterProducts(FilterPoductRequest filterPoductRequest) {
if (filterPoductRequest == null) {
return Collections.emptyList();
}
if (filterPoductRequest.getPage() != null) {
int offset = (filterPoductRequest.getPage() - 1) * filterPoductRequest.getLimit();
PageHelper.offsetPage(offset, filterPoductRequest.getLimit());
}
List<SupProductEntity> supProductEntities = supProductDao.filterProducts(filterPoductRequest);
return supProductEntities;
}
@Override
public boolean modifyRegistration(SupProductEntity companyEntity) {
@ -152,11 +99,6 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
return supProductDao.deleteById(id);
}
@Override
public boolean deleteByEnterpriseId(String enterpriseId) {
return supProductDao.deleteByEnterpriseId(enterpriseId);
}
@Override
public SupProductEntity findExitByManufactury(String cpmctymc, String manufactory, String customerId) {
return supProductDao.findByManufactury(cpmctymc, manufactory, customerId);

2
src/main/java/com/glxp/api/service/sync/BasicDownloadService.java
Unescape Escape View File

@ -9,8 +9,6 @@ import java.util.List;
public interface BasicDownloadService extends IService<BasicDownloadStatusEntity> {
BasicDownloadStatusEntity findByData(String idDatas, Integer status);
List<BasicDownloadStatusEntity> filterDownloadStatus(BasicDownloadRequest basicDownloadRequest);
boolean insertDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity);

2
src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java
Unescape Escape View File

@ -18,6 +18,4 @@ public interface BasicExportTimeService extends IService<BasicExportStatusTimeEn
boolean deleteById(String id);
boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity);
}

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save