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

di绑定多个产品ID，产品绑定多个供应商，流程更改

Browse Source
master
anthonyywj2 3 years ago
parent f95a55f330
commit 722cd0946d
45 changed files with 670 additions and 252 deletions
Show Stats Download Patch File Download Diff File

7
api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java
Unescape Escape View File

@ -72,14 +72,19 @@ public class ConstantStatus {
public static final int CORP_SICK = 1; //病人
public static final int CORP_SP = 2; //供应商
public static final int CORP_INTTERNAL = 3; //内部科室等
public static final int CORP_SPECIAL = 4; //内部科室等
//往来信息类型-单据
public static final int CORP_TYPE_INPUT = 2; //病人
public static final int CORP_TYPE_INPUT = 2; //客户
public static final int CORP_TYPE_OUT = 0; //供应商
public static final int CORP_TYPE_INNOR = 1; //内部科室等
public static final int CORP_TYPE_SPECIAL = 3;
public static final int CORP_SICK_SICK=1;
public static final int CORP_SICK_CUS = 2;
//单据来源
public static final int FROM_UDIMS = 1; //1.UDIMS平台
public static final int FROM_WEBNEW = 2; //网页新增

3
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java
Unescape Escape View File

@ -77,7 +77,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BasicUnitMaintainEntity> basicUnitMaintainEntities;
// basicUnitMaintainFilterRequest.setCorpType(ConstantStatus.CORP_SP);
basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
PageInfo<BasicUnitMaintainEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
PageSimpleResponse<BasicUnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
@ -126,6 +126,7 @@ public class BasicUnitMaintainController {
BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity);
basicUnitMaintainEntity.setErpId(CustomUtil.getId());
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
boolean b = basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);

3
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java
Unescape Escape View File

@ -29,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
@ -134,7 +135,7 @@ public class CorpImportLogController {
try {
String fileType = fileName.substring(fileName.lastIndexOf("."));
if (".udi".equalsIgnoreCase(fileType)) {
String jsonData = IoUtil.read(file.getInputStream()).toString();
String jsonData = IoUtil.read(file.getInputStream(), StandardCharsets.UTF_8);
BasicUnitMaintainExportResponse data = JSONUtil.toBean(jsonData, BasicUnitMaintainExportResponse.class);
//导入日志

3
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoImportLogController.java
Unescape Escape View File

@ -30,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.sql.Date;
import java.util.List;
@ -139,7 +140,7 @@ public class UdiInfoImportLogController {
return ResultVOUtils.error(500, "请上传udi文件");
}
//导入数据
String jsonData = IoUtil.read(file.getInputStream()).toString();
String jsonData = IoUtil.read(file.getInputStream(), StandardCharsets.UTF_8);
// UdiRelevanceExportJsonResponse importData = JSON.parse(jsonData, UdiRelevanceExportJsonResponse.class);
UdiRelevanceExportJsonResponse importData =
JSONObject.parseObject(jsonData, new TypeReference<UdiRelevanceExportJsonResponse>() {

24
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -12,6 +12,7 @@ import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.inventory.InvProductEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
@ -26,6 +27,8 @@ import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
import com.glxp.sale.admin.service.inout.CodesService;
import com.glxp.sale.admin.service.inventory.InvPreProductService;
import com.glxp.sale.admin.service.inventory.InvProductService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.thrsys.ThrDataService;
import com.glxp.sale.admin.thread.BasicBackUpdateProductService;
@ -76,6 +79,10 @@ public class UdiRelevanceController {
BasicThirdSysDetailService basicThirdSysDetailService;
@Resource
ThrDataService thrDataService;
@Resource
InvProductService invProductService;
@Resource
InvPreProductService invPreProductService;
@Resource
private CompanyProductRelevanceService companyProductRelevanceService;
@ -344,6 +351,23 @@ public class UdiRelevanceController {
return ResultVOUtils.success("更新成功");
}
//更换关联ERP产品
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/disable")
public BaseResponse disable(@RequestBody CombineRequest combineRequest) {
InvProductEntity invProductEntity = invProductService.selectExit(combineRequest.getRelId());
if (invProductEntity != null) {
return ResultVOUtils.error(500, "库存已存在，无法禁用");
}
InvProductEntity invPreProductEntity = invPreProductService.selectExit(combineRequest.getRelId());
if (invPreProductEntity != null) {
return ResultVOUtils.error(500, "库存已存在，无法禁用");
}
return ResultVOUtils.success("更新成功");
}
public void removeProducts(CombineRequest combineRequest) {
UdiRelevanceEntity temp = udiRelevanceService.selectById(combineRequest.getRelId());

30
api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java
Unescape Escape View File

@ -2,7 +2,9 @@ package com.glxp.sale.admin.controller.info;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.controller.basic.BasicUnitMaintainController;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.exception.JsonException;
@ -14,6 +16,7 @@ import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.thread.CompanyProductsRelService;
@ -30,6 +33,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -43,6 +47,8 @@ public class CompanyProductRelevanceController {
private CompanyProductsRelService companyProductsRelService;
@Resource
CompanyService companyService;
@Resource
private BasicUnitMaintainService basicUnitMaintainService;
@AuthRuleAnnotation("")
@GetMapping("/sale/info/company/product/relevance/filter")
@ -72,6 +78,30 @@ public class CompanyProductRelevanceController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/sale/info/company/product/corp/filter")
public BaseResponse filterRlCorp(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<CompanyProductRelevanceEntity> companyProductRelevanceEntities =
companyProductRelevanceService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
if (!companyProductRelevanceEntities.isEmpty()) {
List<String> erpIds = new ArrayList<>();
for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) {
erpIds.add(companyProductRelevanceEntity.getUnitFk());
}
List<BasicUnitMaintainEntity> basicUnitMaintainEntities = basicUnitMaintainService.batchSelectByErpIds(erpIds);
return ResultVOUtils.success(basicUnitMaintainEntities);
}
return ResultVOUtils.error(500, "该产品未关联供应商！");
}
@AuthRuleAnnotation("")
@GetMapping("/sale/info/companyProductRelevance")
public BaseResponse getCompanyProductRelevanceInfo(CompanyRequest companyRequest) {

3
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
Unescape Escape View File

@ -185,11 +185,12 @@ public class StockOrderController {
if (stockOrderPostRequest.getCorpId() == null) {
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(stockOrderPostRequest.getCorpName());
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
if (basicUnitMaintainEntity == null && bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
if (basicUnitMaintainEntity == null && bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessLocalTypeEntity.isGenUnit()) {
basicUnitMaintainEntity = new BasicUnitMaintainEntity();
basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId());
stockOrderPostRequest.setCorpId(basicUnitMaintainEntity.getErpId());
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
basicUnitMaintainEntity.setName(stockOrderPostRequest.getCorpName());
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
}

94
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
Unescape Escape View File

@ -16,14 +16,17 @@ import com.glxp.sale.admin.entity.inout.OrderEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.inout.*;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.BussinessTypResponse;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.res.inout.WarehouseResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.service.inout.*;
import com.glxp.sale.admin.thread.IoTransInoutService;
@ -77,6 +80,8 @@ public class WareHouseController {
private WarehouseBussinessTypeService warehouseBussinessTypeService;
@Resource
CustomerService customerService;
@Resource
UdiRelevanceService udiRelevanceService;
@AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/list")
@ -237,6 +242,14 @@ public class WareHouseController {
orderEntity1.setFromCorpId(addOrderRequest.getFromCorpId());
orderEntity1.setLocStorageCode(addOrderRequest.getLocStorageCode());
orderService.updateOrder(orderEntity1);
WarehouseEntity warehouseEntity = new WarehouseEntity();
warehouseEntity.setOrderId(addOrderRequest.getOrderId());
warehouseEntity.setAction(addOrderRequest.getAction());
warehouseEntity.setMainAction(addOrderRequest.getMainAction());
warehouseEntity.setFromCorp(addOrderRequest.getAction());
warehouseEntity.setFromCorpId(addOrderRequest.getFromCorpId());
warehouseEntity.setLocStorageCode(addOrderRequest.getLocStorageCode());
codesTempService.updateByOrderId(warehouseEntity);
return ResultVOUtils.success();
}
@ -257,8 +270,7 @@ public class WareHouseController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
try {
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getBillType());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction());
String code = addOrderRequest.getCode();
if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
@ -272,11 +284,12 @@ public class WareHouseController {
} else {
if (addOrderRequest.getFromCorpId() == null) {
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(addOrderRequest.getFromCorp());
if (basicUnitMaintainEntity == null && bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
if (basicUnitMaintainEntity == null && bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) {
basicUnitMaintainEntity = new BasicUnitMaintainEntity();
basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId());
addOrderRequest.setFromCorpId((basicUnitMaintainEntity.getErpId()));
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
basicUnitMaintainEntity.setName(addOrderRequest.getFromCorp());
addOrderRequest.setFromCorp(basicUnitMaintainEntity.getName());
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
@ -284,7 +297,7 @@ public class WareHouseController {
}
}
//先生产扫码单据
if (StringUtils.isBlank(orderId)) {
orderId = "SM" + CustomUtil.getId();
OrderEntity orderSaveRequest = new OrderEntity();
@ -311,6 +324,8 @@ public class WareHouseController {
orderSaveRequest.setCreateUser(userId);
orderService.insertOrder(orderSaveRequest);
}
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
warehouseQueryRequest.setOrderId(orderId);
warehouseQueryRequest.setCode(code);
@ -325,6 +340,7 @@ public class WareHouseController {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
}
} else {
warehouseEntity.setCode(code);
warehouseEntity.setOrderId(orderId);
warehouseEntity.setCorpOrderId(addOrderRequest.getCorpOrderId());
@ -343,15 +359,79 @@ public class WareHouseController {
warehouseEntity.setCount(1);
List<WarehouseEntity> warehouseEntityList = new ArrayList<>();
warehouseEntityList.add(warehouseEntity);
codesTempService.insertCodesTempSingle(warehouseEntity);
BaseResponse baseResponse = checkRelId(warehouseEntity);
warehouseEntity = codesTempService.findByUnique(warehouseEntity.getOrderId(), warehouseEntity.getCode());
if (baseResponse == null) {
baseResponse = checkSupId(bussinessTypeEntity, warehouseEntity);
if (baseResponse != null)
return baseResponse;
} else {
checkSupId(bussinessTypeEntity, warehouseEntity);
return baseResponse;
}
}
return ResultVOUtils.success(orderId);
} catch (Exception e) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
public BaseResponse checkRelId(WarehouseEntity warehouseEntity) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(warehouseEntity.getNameCode());
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息
warehouseEntity.setRelId(null);
warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
codesTempService.insertCodesTempSingle(warehouseEntity);
warehouseEntity = codesTempService.findByUnique(warehouseEntity.getOrderId(), warehouseEntity.getCode());
BaseResponse baseResponse = ResultVOUtils.error(502, "DI绑定多个产品ID,请指定对应产品");
baseResponse.setData(warehouseEntity);
return baseResponse;
} else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息，一般不会出现
warehouseEntity.setRelId(null);
warehouseEntity.setStatus(2);
return ResultVOUtils.error(501, "产品信息未维护！");
} else {
warehouseEntity.setStatus(0);
if (warehouseEntity.getRelId() == null)
warehouseEntity.setRelId(udiRelevanceEntities.get(0).getId() + "");
}
codesTempService.insertCodesTempSingle(warehouseEntity);
return null;
}
public BaseResponse checkSupId(BussinessTypeEntity bussinessTypeEntity, WarehouseEntity warehouseEntity) {
String originSupId = ioTransInoutService.checkOriginExitSup(bussinessTypeEntity, warehouseEntity);
if (originSupId != null) {
warehouseEntity.setSupId(originSupId);
} else {
String supId = ioTransInoutService.checkExitSup(warehouseEntity.getRelId());
if (supId == null || "MUTI".equals(supId)) {
warehouseEntity.setSupId(null);
BaseResponse baseResponse = ResultVOUtils.error(503, "该产品绑定多供应商,请指定对应的供应商");
baseResponse.setData(warehouseEntity);
return baseResponse;
} else {
warehouseEntity.setSupId(supId);
}
}
codesTempService.updateById(warehouseEntity);
return null;
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/addCode/updateBindSup")
public BaseResponse updateBindSup(@RequestBody WarehouseEntity warehouseEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
boolean b = codesTempService.update(warehouseEntity);
return ResultVOUtils.success("绑定成功");
}
//网页端数据上传调用接口
@AuthRuleAnnotation("")

44
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java
Unescape Escape View File

@ -47,27 +47,29 @@ public class CheckOrderUtils {
for (ErpOrderEntity myErpOrder : myErpOrders) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(myErpOrder.getNameCode());
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && myErpOrder.getBindRlFk() == null) {
myErpOrder.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
orderDetailService.updateErpOrder(myErpOrder);
orderEntity.setRemark("该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID");
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
orderService.updateOrder(orderEntity);
return;
} else {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(myErpOrder.getBindRlFk());
// List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
// if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && myErpOrder.getBindRlFk() == null) {
// myErpOrder.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
// orderDetailService.updateErpOrder(myErpOrder);
// orderEntity.setRemark("该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID");
// orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
// orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
// orderService.updateOrder(orderEntity);
// return;
// } else {
for (ErpOrderEntity vailOrderEntity : vailOrderEntities) {
UdiRelevanceResponse udiRelevanceResponse = null;
if (udiRelevanceEntities.size() == 1) {
udiRelevanceResponse = udiRelevanceEntities.get(0);
} else {
for (UdiRelevanceResponse temps : udiRelevanceEntities) {
if ((temps.getId() + "").equals(myErpOrder.getBindRlFk())) {
udiRelevanceResponse = temps;
}
}
}
// UdiRelevanceResponse udiRelevanceResponse = null;
// if (udiRelevanceEntities.size() == 1) {
// udiRelevanceResponse = udiRelevanceEntities.get(0);
// } else {
// for (UdiRelevanceResponse temps : udiRelevanceEntities) {
// if ((temps.getId() + "").equals(myErpOrder.getBindRlFk())) {
// udiRelevanceResponse = temps;
// }
// }
// }
if (checkId(vailOrderEntity, udiRelevanceResponse) == null
&& checkBatchNo(vailOrderEntity, myErpOrder) == null
&& checkProductDate(vailOrderEntity, myErpOrder) == null
@ -121,7 +123,7 @@ public class CheckOrderUtils {
}
}
// }
if (checkFinish(myErpOrders, vailOrderEntities)) {
orderEntity.setRemark("校验成功");
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);

5
api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java
Unescape Escape View File

@ -83,6 +83,7 @@ public class InvWarehouseController {
@GetMapping("spms/inv/warehouse/filterAll")
public BaseResponse filterAllInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setStatus(1);
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
return ResultVOUtils.success(invWarehouseEntities);
}
@ -92,6 +93,7 @@ public class InvWarehouseController {
@GetMapping("spms/inv/warehouse/filterAllLocInv")
public BaseResponse filterAllLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setStatus(1);
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
List<InvWarehouseEntity> temps = new ArrayList<>();
@ -163,6 +165,9 @@ public class InvWarehouseController {
filterInvWarehouseRequest.setPid(invWarehouseEntity.getPid());
InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest);
invWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
if (invWarehouseEntity.getLevel() == 1) {
invWarehouseEntity.setPcode("0");
}
} else {//货位
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();

3
api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpImportLogController.java
Unescape Escape View File

@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
@ -116,7 +117,7 @@ public class ThrCorpImportLogController {
return ResultVOUtils.error(500, "请上传udi文件");
}
//导入数据
String jsonData = IoUtil.read(file.getInputStream()).toString();
String jsonData = IoUtil.read(file.getInputStream(), StandardCharsets.UTF_8);
List<ThrCorpEntity> thrCorpEntities = com.alibaba.fastjson.JSON.parseArray(jsonData, ThrCorpEntity.class);
//导入日志

7
api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrInvWarehouseController.java
Unescape Escape View File

@ -76,7 +76,14 @@ public class ThrInvWarehouseController {
FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest();
filterThrInvWarehouseRequest.setPid(thrInvWarehouseEntity.getPid());
ThrInvWarehouseEntity codeEntity = thrInvWarehouseService.selectMaxCode(filterThrInvWarehouseRequest);
// if(codeEntity == null)
if (codeEntity == null) {
int code = Integer.parseInt("1") * 1000;
thrInvWarehouseEntity.setCode(code + "");
} else {
thrInvWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
}
// thrInvWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
} else {//货位
FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest();

3
api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderImportLogController.java
Unescape Escape View File

@ -34,6 +34,7 @@ import javax.annotation.Resource;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -328,7 +329,7 @@ public class ThrOrderImportLogController {
try {
String fileType = fileName.substring(fileName.lastIndexOf("."));
if (".udi".equalsIgnoreCase(fileType)) {
String jsonData = IoUtil.read(file.getInputStream()).toString();
String jsonData = IoUtil.read(file.getInputStream(), StandardCharsets.UTF_8);
ThrOrderExportJsonResponse data = JSONUtil.toBean(jsonData, ThrOrderExportJsonResponse.class);
//导入日志

3
api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java
Unescape Escape View File

@ -28,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
@ -119,7 +120,7 @@ public class ThrProductsImportLogController {
return ResultVOUtils.error(500, "请上传udi文件");
}
//导入数据
String jsonData = IoUtil.read(file.getInputStream()).toString();
String jsonData = IoUtil.read(file.getInputStream(), StandardCharsets.UTF_8);
List<ThrProductsEntity> thrProductsEntities = JSON.parseArray(jsonData, ThrProductsEntity.class);
//导入日志

2
api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicUnitMaintainDao.java
Unescape Escape View File

@ -12,6 +12,7 @@ public interface BasicUnitMaintainDao {
List<BasicUnitMaintainEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity);
boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity);
boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity);
@ -26,6 +27,7 @@ public interface BasicUnitMaintainDao {
List<BasicUnitMaintainEntity> batchSelectByIds(@Param("ids") List<Integer> id);
List<BasicUnitMaintainEntity> batchSelectByErpIds(@Param("erpIds") List<String> erpIds);
BasicUnitMaintainEntity selectByName(@Param("name") String name);

4
api-admin/src/main/java/com/glxp/sale/admin/dao/inout/CodesTempDao.java
Unescape Escape View File

@ -16,6 +16,10 @@ public interface CodesTempDao {
int updateById(WarehouseEntity warehouseEntitie);
boolean update(WarehouseEntity warehouseEntity);
boolean updateByOrderId(WarehouseEntity warehouseEntity);
boolean updateOrderId(@Param("oldOrderId") String oldOrderId, @Param("newOrderId") String newOrderId);
int deleteCodesTemp(@Param("codes") List<Long> warehouseEntities);

2
api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreProductDao.java
Unescape Escape View File

@ -26,6 +26,8 @@ public interface InvPreProductDao {
InvProductEntity selectById(@Param("id") String id);
InvProductEntity selectExit(@Param("relIdFk") String id);
boolean deleteById(@Param("id") String id);
}

2
api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvProductDao.java
Unescape Escape View File

@ -16,6 +16,8 @@ public interface InvProductDao {
List<InvProductResponse> filterJoinInvProduct(FilterInvProductRequest filterInvProductRequest);
InvProductEntity selectExit(@Param("relIdFk") String id);
boolean insertInvProduct(InvProductEntity invProductEntity);
boolean updateInvProduct(InvProductEntity invProductEntity);

1
api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicUnitMaintainEntity.java
Unescape Escape View File

@ -32,6 +32,7 @@ public class BasicUnitMaintainEntity {
private Date updateTime;
private int corpType;
private int outType;
}

3
api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java
Unescape Escape View File

@ -19,5 +19,6 @@ public class BussinessLocalTypeEntity {
private boolean spUse;
private String storageCode;
private int corpType;
private String defaultUnit;
private boolean genUnit;
}

1
api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java
Unescape Escape View File

@ -40,6 +40,7 @@ public class ErpOrderEntity {
private Integer reCount;
private String uuidFk;
private String supId;
private String supName;
private Integer bindSupStatus;

1
api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java
Unescape Escape View File

@ -25,6 +25,7 @@ public class WarehouseEntity {
private String customerId;
private String nameCode;
private String supId;//供应商ID
private String supName;
private String invStorageCode;
private String invWarehouseCode;
private String relId;

1
api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvWarehouseEntity.java
Unescape Escape View File

@ -19,6 +19,7 @@ public class InvWarehouseEntity {
private String remark;
private Integer level;
private String pcode;
private String pName;
/**
* 第三方仓库ID

1
api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicUnitMaintainFilterRequest.java
Unescape Escape View File

@ -23,6 +23,7 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest {
private String thirdId4;
private String erpId;
private Integer corpType;
private Integer outType;
private Boolean isDownThrSys;
List<ErpUnitsResponse> thrCorpEntities;

1
api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java
Unescape Escape View File

@ -21,6 +21,7 @@ public class InvProductResponse {
private String companyName;
private String supId;
private String unitFk;
private String invStorageCode;
private String invStorageName;
public Integer getInCount() {

1
api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvWarehouseResponse.java
Unescape Escape View File

@ -19,6 +19,7 @@ public class InvWarehouseResponse {
private Integer status;
private Date updateTime;
private String remark;
private String pName;
private Integer level;
private String pcode;

3
api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerInfoServiceImpl.java
Unescape Escape View File

@ -37,8 +37,11 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
if (customerInfoFilterRequest == null) {
return Collections.emptyList();
}
if(customerInfoFilterRequest.getPage()!=null){
int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit());
}
return customerInfoDao.filterCustomerInfo(customerInfoFilterRequest);
}

2
api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicUnitMaintainService.java
Unescape Escape View File

@ -28,6 +28,8 @@ public interface BasicUnitMaintainService {
List<BasicUnitMaintainEntity> batchSelectByIds(List<Integer> id);
List<BasicUnitMaintainEntity> batchSelectByErpIds(List<String> erpIds);
BasicUnitMaintainEntity selectById(String id);
BasicUnitMaintainEntity selectByErpId(String id);

5
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java
Unescape Escape View File

@ -81,6 +81,11 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService {
return basicUnitMaintainDao.batchSelectByIds(ids);
}
@Override
public List<BasicUnitMaintainEntity> batchSelectByErpIds(List<String> erpIds) {
return basicUnitMaintainDao.batchSelectByErpIds(erpIds);
}
@Override
public BasicUnitMaintainEntity selectById(String id) {
return basicUnitMaintainDao.selectById(id);

6
api-admin/src/main/java/com/glxp/sale/admin/service/inout/CodesTempService.java
Unescape Escape View File

@ -7,11 +7,15 @@ import java.util.List;
public interface CodesTempService {
int insertCodesTemp(List<WarehouseEntity> warehouseEntities);
int insertCodesTempSingle(WarehouseEntity warehouseEntitie);
int updateById(WarehouseEntity warehouseEntitie);
boolean update(WarehouseEntity warehouseEntity);
boolean updateByOrderId(WarehouseEntity warehouseEntity);
boolean updateOrderId(String oldOrderId, String newOrderId);
@ -23,4 +27,6 @@ public interface CodesTempService {
List<WarehouseEntity> findByOrderIdAndCode(WarehouseQueryRequest warehouseQueryRequest);
WarehouseEntity findByUnique(String orderId, String code);
}

23
api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesTempServiceImpl.java
Unescape Escape View File

@ -33,6 +33,16 @@ public class CodesTempServiceImpl implements CodesTempService {
return codesTempDao.updateById(warehouseEntitie);
}
@Override
public boolean update(WarehouseEntity warehouseEntity) {
return codesTempDao.update(warehouseEntity);
}
@Override
public boolean updateByOrderId(WarehouseEntity warehouseEntity) {
return codesTempDao.updateByOrderId(warehouseEntity);
}
@Override
public boolean updateOrderId(String oldOrderId, String newOrderId) {
return codesTempDao.updateOrderId(oldOrderId, newOrderId);
@ -71,4 +81,17 @@ public class CodesTempServiceImpl implements CodesTempService {
}
return codesTempDao.findByOrderIdAndCode(warehouseQueryRequest);
}
@Override
public WarehouseEntity findByUnique(String orderId, String code) {
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
warehouseQueryRequest.setOrderId(orderId);
warehouseQueryRequest.setCode(code);
List<WarehouseEntity> warehouseEntityList = codesTempDao.findByOrderIdAndCode(warehouseQueryRequest);
if (!warehouseEntityList.isEmpty()) {
return warehouseEntityList.get(0);
}
return null;
}
}

2
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreProductService.java
Unescape Escape View File

@ -14,6 +14,8 @@ public interface InvPreProductService {
InvProductEntity selectByUuid(String uuid, String batchNo, String supId, String invStorageCode, String invWarehouseCode);
InvProductEntity selectExit(String id);
InvProductEntity selectById(String id);
boolean insertInvProduct(InvProductEntity invProductEntity);

2
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvProductService.java
Unescape Escape View File

@ -17,6 +17,8 @@ public interface InvProductService {
InvProductEntity selectById(String id);
InvProductEntity selectExit(String id);
boolean insertInvProduct(InvProductEntity invProductEntity);
boolean updateInvProduct(InvProductEntity invProductEntity);

5
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreProductServiceImpl.java
Unescape Escape View File

@ -66,6 +66,11 @@ public class InvPreProductServiceImpl implements InvPreProductService {
// return null;
}
@Override
public InvProductEntity selectExit(String id) {
return invPreProductDao.selectExit(id);
}
@Override
public InvProductEntity selectById(String id) {
return invPreProductDao.selectById(id);

5
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductServiceImpl.java
Unescape Escape View File

@ -66,6 +66,11 @@ public class InvProductServiceImpl implements InvProductService {
return invProductDao.selectById(id);
}
@Override
public InvProductEntity selectExit(String id) {
return invProductDao.selectExit(id);
}
@Override
public boolean insertInvProduct(InvProductEntity invProductEntity) {
return invProductDao.insertInvProduct(invProductEntity);

39
api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
Unescape Escape View File

@ -1037,26 +1037,27 @@ public class InvProductsTrService {
invProductDetailEntity.setUnitFk(orderEntity.getFromCorpId());
invProductDetailEntity.setUpdateTime(new Date());
invProductDetailEntity.setCustomerId(orderEntity.getCustomerId());
if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
if (warehouseEntity.getSupId() != null) {
invProductDetailEntity.setSupId(warehouseEntity.getSupId());
} else {
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setMainAction(ConstantType.TYPE_PUT);
filterInvProductDetailRequest.setCode(warehouseEntity.getCode());
List<InvProductDetailEntity> temps = null;
if (isPre) {
temps = invPreProductDetailService.filterInvProduct(filterInvProductDetailRequest);
} else {
temps = invProductDetailService.filterInvProduct(filterInvProductDetailRequest);
}
if (temps.size() > 0) {
invProductDetailEntity.setSupId(temps.get(0).getSupId());
}
}
} else {
invProductDetailEntity.setSupId(orderEntity.getFromCorpId());
}
// if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
// if (warehouseEntity.getSupId() != null) {
// invProductDetailEntity.setSupId(warehouseEntity.getSupId());
// } else {
// FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
// filterInvProductDetailRequest.setMainAction(ConstantType.TYPE_PUT);
// filterInvProductDetailRequest.setCode(warehouseEntity.getCode());
// List<InvProductDetailEntity> temps = null;
// if (isPre) {
// temps = invPreProductDetailService.filterInvProduct(filterInvProductDetailRequest);
// } else {
// temps = invProductDetailService.filterInvProduct(filterInvProductDetailRequest);
// }
// if (temps.size() > 0) {
// invProductDetailEntity.setSupId(temps.get(0).getSupId());
// }
// }
// } else {
// invProductDetailEntity.setSupId(orderEntity.getFromCorpId());
// }
mInvProductDetailEntities.add(invProductDetailEntity);
}

132
api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -17,6 +17,7 @@ import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
import com.glxp.sale.admin.entity.inventory.InvProductEntity;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
@ -25,6 +26,8 @@ import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest;
import com.glxp.sale.admin.req.inout.*;
import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest;
import com.glxp.sale.admin.req.inventory.FilterInvProductRequest;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
@ -33,7 +36,9 @@ import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.service.inout.*;
import com.glxp.sale.admin.service.inventory.InvPreProductService;
import com.glxp.sale.admin.service.inventory.InvProductDetailService;
import com.glxp.sale.admin.service.inventory.InvProductService;
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.thrsys.ThrDataService;
@ -102,6 +107,10 @@ public class IoTransInoutService {
private CheckOrderUtils checkOrderUtils;
@Resource
InvProductDetailService invProductDetailService;
@Resource
InvProductService invProductService;
@Resource
InvPreProductService invPreProductService;
//web端新增订单，
@Async
@ -309,10 +318,11 @@ public class IoTransInoutService {
return;
} else if (orderEntity.getFromCorpId() == null) {
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) {
BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId());
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
basicUnitMaintainEntity.setName(orderEntity.getFromCorp());
orderEntity.setFromCorpId(basicUnitMaintainEntity.getErpId());
orderService.updateOrder(orderEntity);
@ -401,6 +411,20 @@ public class IoTransInoutService {
}
}
//产品是否已维护已关联
if (StrUtil.isEmpty(warehouseEntity.getRelId())) {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "绑定多个产品ID！");
return;
}
//产品是否指定供应商
if (StrUtil.isEmpty(warehouseEntity.getSupId())) {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "未指定供应商！");
return;
}
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode());
if (udiRelevanceResponses.size() == 1) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
@ -413,14 +437,14 @@ public class IoTransInoutService {
orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "该产品不允许以使用单元入库！");
return;
}
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(udiRelevanceResponse.getId() + "", warehouseEntity.getFromCorpId());
if (companyProductRelevanceEntity == null) {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateRemark(orderEntity.getId(), udiRelevanceResponse.getCpmctymc() + "该产品非此供应商配送");
return;
}
}
// if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
// CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(udiRelevanceResponse.getId() + "", warehouseEntity.getFromCorpId());
// if (companyProductRelevanceEntity == null) {
// orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
// orderService.updateRemark(orderEntity.getId(), udiRelevanceResponse.getCpmctymc() + "该产品非此供应商配送");
// return;
// }
// }
}
}
@ -449,6 +473,7 @@ public class IoTransInoutService {
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(action);
List<WarehouseEntity> warehouseEntityList = warehouseService.findByReceiptId(orderId);
myErpOrderService.deleteByOrderId(orderEntity.getId());
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
//为所有条码关联基础信息关联表ID
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
@ -456,12 +481,10 @@ public class IoTransInoutService {
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
//默认或已选中供应商
String originSupId = checkOriginExitSup(warehouseEntity);
String originSupId = checkOriginExitSup(bussinessTypeEntity, warehouseEntity);
if (originSupId != null) {
warehouseEntity.setSupId(originSupId);
}
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息
warehouseEntity.setRelId(null);
warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
@ -498,7 +521,7 @@ public class IoTransInoutService {
}
warehouseService.updateCode(warehouseEntity);
}
orderService.updateOrder(orderEntity);
if (!bussinessTypeEntity.isCheckEnable()) {
orderEntity = orderService.findById(orderEntity.getId());
@ -542,7 +565,7 @@ public class IoTransInoutService {
}
}
genOrderDetail(warehouseEntityList);
checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID
// checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID
orderEntity = orderService.findById(orderEntity.getId());
if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) {
orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK);
@ -553,7 +576,7 @@ public class IoTransInoutService {
public void unCheckFinish(OrderEntity orderEntity, List<WarehouseEntity> warehouseEntityList) {
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
genOrderDetail(warehouseEntityList);
checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID
// checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID
orderEntity = orderService.findById(orderEntity.getId());
if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) {
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllByOrderIdFk(orderEntity.getId());
@ -574,10 +597,10 @@ public class IoTransInoutService {
}
}
public String checkOriginExitSup(WarehouseEntity warehouseEntity) {
public String checkOriginExitSup(BussinessTypeEntity bussinessTypeEntity, WarehouseEntity warehouseEntity) {
if (warehouseEntity.getSupId() != null && !"".equals(warehouseEntity.getSupId())) {
return warehouseEntity.getSupId();
} else if (ConstantType.TYPE_PUT.equals(warehouseEntity.getMainAction())) {
} else if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT && ConstantType.TYPE_PUT.equals(warehouseEntity.getMainAction())) {
return warehouseEntity.getFromCorpId();
}
return null;
@ -612,14 +635,77 @@ public class IoTransInoutService {
public String checkInvExitSup(WarehouseEntity warehouseEntity) {
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setProductIdFk(warehouseEntity.getRelId());
String supId = checkNorInv(warehouseEntity);
if (supId == null) {
return checkPreInv(warehouseEntity);
}
return supId;
}
//查普通库存
public String checkNorInv(WarehouseEntity warehouseEntity) {
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(warehouseEntity.getRelId());
filterInvProductDetailRequest.setBatchNo(warehouseEntity.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;
}
//查寄售库存
public String checkPreInv(WarehouseEntity warehouseEntity) {
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(warehouseEntity.getRelId());
filterInvProductDetailRequest.setBatchNo(warehouseEntity.getBatchNo());
filterInvProductDetailRequest.setInvStorageCode(warehouseEntity.getLocStorageCode());
List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.filterInvProduct(filterInvProductDetailRequest);
if (invProductDetailEntities.size() > 0) {
return invProductDetailEntities.get(0).getSupId();
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;
}

2
api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
Unescape Escape View File

@ -40,7 +40,7 @@
</select>
<select id="findCountByCustomerId" parameterType="java.lang.Long" resultType="java.lang.Integer">
SELECT count(0)
FROM udi_user
FROM auth_user
where CustomerId = #{id}
</select>

21
api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml
Unescape Escape View File

@ -8,7 +8,8 @@
SELECT * FROM basic_corp
<where>
<if test="key != '' and key!=null">
and name like concat('%',#{key},'%')
and
( name like concat('%',#{key},'%')
or spell like concat('%',#{key},'%')
or erpId like concat('%',#{key},'%')
or creditNo like concat('%',#{key},'%')
@ -18,6 +19,7 @@
or thirdId3 like concat('%',#{key},'%')
or thirdId4 like concat('%',#{key},'%')
or addr like concat('%',#{key},'%')
)
</if>
<if test="id != '' and id != null">
AND id = #{id}
@ -31,7 +33,9 @@
<if test="corpType != null">
AND corpType = #{corpType}
</if>
<if test="outType != null">
AND ( outType <![CDATA[ <> ]]> #{outType} or outType is NULL)
</if>
</where>
order by updateTime desc
@ -70,7 +74,7 @@
INTO basic_corp
(thirdId,erpId,name,spell,
addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4,
thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType)
thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType,outType)
values
(
#{thirdId},
@ -93,7 +97,8 @@
#{thirdName3},
#{thirdName4},
#{updateTime},
#{corpType}
#{corpType},
#{outType}
)
</insert>
@ -202,6 +207,14 @@
</foreach>
</select>
<select id="batchSelectByErpIds" resultType="com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity">
select *
from basic_corp where erpId in
<foreach collection="erpIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</select>
<select id="selectByName" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity">
SELECT *

3
api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
Unescape Escape View File

@ -58,7 +58,8 @@
localAction,originAction,
basic_bussiness_type.name ,
basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable,
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction,
basic_bussiness_type.defaultUnit,basic_bussiness_type.genUnit
FROM basic_bustype_local
inner join basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction
INNER JOIN inv_warehouse_bussiness_type on basic_bussiness_type.action = inv_warehouse_bussiness_type.action

57
api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml
Unescape Escape View File

@ -9,7 +9,7 @@
(action, mainAction,code, corpOrderId, actor,actDate,
fromCorpId, fromCorp,
orderId,batchNo,produceDate,expireDate,serialNo,
count,nameCode,supId,invStorageCode,invWarehouseCode,locStorageCode)
count,nameCode,supId,invStorageCode,invWarehouseCode,locStorageCode,relId)
VALUES
<foreach collection="codes" item="item" index="index"
separator=",">
@ -28,7 +28,7 @@
,#{item.expireDate}
,#{item.serialNo}
,#{item.count},#{item.nameCode},#{item.supId},
#{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode}
#{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode},#{item.relId}
)
</foreach>
</insert>
@ -38,7 +38,7 @@
parameterType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
INSERT INTO io_codes_temp(action, mainAction, code, corpOrderId, actor, actDate,
fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo,
count, nameCode, supId, invStorageCode, invWarehouseCode,locStorageCode)
count, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode,relId)
values (#{action},
#{mainAction},
#{code},
@ -52,25 +52,26 @@
#{produceDate},
#{expireDate},
#{serialNo},
#{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode},#{locStorageCode})
#{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode},#{relId})
</insert>
<select id="findByOrderId" parameterType="com.glxp.sale.admin.req.inout.WarehouseQueryRequest"
resultType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
SELECT *
FROM io_codes_temp
SELECT io_codes_temp.*,basic_corp.name supName
FROM io_codes_temp left join basic_corp on io_codes_temp.supId = basic_corp.erpId
<where>
<if test="orderId != '' and orderId!=null">
and orderId =#{orderId}
and io_codes_temp.orderId =#{orderId}
</if>
<if test="code != '' and code!=null">
and code LIKE concat('%',#{code},'%')
and io_codes_temp.code LIKE concat('%',#{code},'%')
</if>
<if test="batchNo != '' and batchNo!=null">
and batchNo =#{batchNo}
and io_codes_temp.batchNo =#{batchNo}
</if>
</where>
order by id desc
group by io_codes_temp.id
order by io_codes_temp.id desc
</select>
<select id="findByOrderIdAndCode" parameterType="com.glxp.sale.admin.req.inout.WarehouseQueryRequest"
@ -91,9 +92,45 @@
UPDATE io_codes_temp
<set>
<if test="count != null">`count`=#{count},</if>
<if test="action != null">`action`=#{action},</if>
<if test="mainAction != null">`mainAction`=#{mainAction},</if>
<if test="fromCorpId != null">`fromCorpId`=#{fromCorpId},</if>
<if test="fromCorp != null">`fromCorp`=#{fromCorp},</if>
<if test="locStorageCode != null">`locStorageCode`=#{locStorageCode},</if>
<if test="supId != null">`supId`=#{supId},</if>
<if test="relId != null">`relId`=#{relId},</if>
</set>
WHERE id=#{id}
</update>
<update id="update" parameterType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
UPDATE io_codes_temp
<set>
<if test="action != null">`action`=#{action},</if>
<if test="mainAction != null">`mainAction`=#{mainAction},</if>
<if test="fromCorpId != null">`fromCorpId`=#{fromCorpId},</if>
<if test="fromCorp != null">`fromCorp`=#{fromCorp},</if>
<if test="locStorageCode != null">`locStorageCode`=#{locStorageCode},</if>
<if test="supId != null">`supId`=#{supId},</if>
<if test="relId != null">`relId`=#{relId},</if>
</set>
WHERE id=#{id}
</update>
<update id="updateByOrderId" parameterType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
UPDATE io_codes_temp
<set>
<if test="action != null">`action`=#{action},</if>
<if test="mainAction != null">`mainAction`=#{mainAction},</if>
<if test="fromCorpId != null">`fromCorpId`=#{fromCorpId},</if>
<if test="fromCorp != null">`fromCorp`=#{fromCorp},</if>
<if test="locStorageCode != null">`locStorageCode`=#{locStorageCode},</if>
<if test="supId != null">`supId`=#{supId},</if>
<if test="relId != null">`relId`=#{relId},</if>
</set>
WHERE orderId=#{orderId}
</update>
<update id="updateOrderId" parameterType="Map">
UPDATE io_codes_temp
SET orderId = #{newOrderId}

15
api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml
Unescape Escape View File

@ -5,21 +5,23 @@
<select id="filterMyErpOrder" parameterType="com.glxp.sale.admin.entity.inout.FilterErpOrderRequest"
resultType="com.glxp.sale.admin.entity.inout.ErpOrderEntity">
select * from io_order_detail
select io_order_detail.* ,basic_corp.name supName from io_order_detail
left join basic_corp on io_order_detail.supId = basic_corp.erpId
<where>
<if test="erpOrderId != '' and erpOrderId!=null">
and erpOrderId = #{erpOrderId}
and io_order_detail.erpOrderId = #{erpOrderId}
</if>
<if test="goodsname != '' and goodsname!=null">
and goodsname = #{goodsname}
and io_order_detail.goodsname = #{goodsname}
</if>
<if test="orderId != '' and orderId!=null">
and orderIdFk = #{orderId}
and io_order_detail.orderIdFk = #{orderId}
</if>
<if test="orderIdFk != '' and orderIdFk!=null">
and orderIdFk = #{orderIdFk}
and io_order_detail.orderIdFk = #{orderIdFk}
</if>
</where>
group by io_order_detail.id
</select>
<select id="findByStockCheck" parameterType="java.util.List"
@ -147,7 +149,8 @@
#{bindStatus},
#{bindRlFk},
#{uuidFk},
#{supId},#{bindSupStatus}
#{supId},
#{bindSupStatus}
)
</insert>

32
api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
Unescape Escape View File

@ -49,7 +49,12 @@
<if test="invWarehouseCode != '' and invWarehouseCode != null">
AND invWarehouseCode = #{invWarehouseCode}
</if>
<if test="invCodes != null and invCodes.size > 0">
AND invStorageCode IN
<foreach collection="invCodes" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
<if test="groupType != '' and groupType != null">
GROUP BY #{groupType}
@ -88,7 +93,15 @@
</where>
</select>
<select id="selectExit" parameterType="Map"
resultType="com.glxp.sale.admin.entity.inventory.InvProductEntity">
SELECT *
FROM inv_pre_product
<where>
relIdFk = #{relIdFk}
</where>
limit 1
</select>
<!-- and supId = #{supId}-->
<select id="filterJoinInvProduct" parameterType="com.glxp.sale.admin.req.inventory.FilterInvProductRequest"
resultType="com.glxp.sale.admin.res.inventory.InvProductResponse">
@ -100,7 +113,8 @@
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
inv_pre_product.inCount,inv_pre_product.outCount
,inv_pre_product.reCount,inv_pre_product.customerId,
basic_corp.name companyName,inv_pre_product.supId,inv_pre_product.unitFk ,inv_warehouse.name invStorageName
basic_corp.name companyName,inv_pre_product.supId,inv_pre_product.unitFk ,inv_warehouse.name
invStorageName,inv_product.invStorageCode
FROM inv_pre_product
inner join basic_udirel on inv_pre_product.relIdFk = basic_udirel.id
inner join basic_products on basic_udirel.uuid = basic_products.uuid
@ -151,6 +165,18 @@
<if test="unitFk != '' and unitFk != null">
AND unitFk = #{unitFk}
</if>
<if test="invStorageCode != '' and invStorageCode != null">
AND invStorageCode = #{invStorageCode}
</if>
<if test="invWarehouseCode != '' and invWarehouseCode != null">
AND invWarehouseCode = #{invWarehouseCode}
</if>
<if test="invCodes != null and invCodes.size > 0">
AND invStorageCode IN
<foreach collection="invCodes" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
<if test="groupType != '' and groupType != null">
GROUP BY #{groupType}

21
api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
Unescape Escape View File

@ -49,6 +49,12 @@
<if test="invWarehouseCode != '' and invWarehouseCode != null">
AND invWarehouseCode = #{invWarehouseCode}
</if>
<if test="invCodes != null and invCodes.size > 0">
AND invStorageCode IN
<foreach collection="invCodes" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
</where>
<if test="groupType != '' and groupType != null">
GROUP BY #{groupType}
@ -67,7 +73,6 @@
resultType="com.glxp.sale.admin.entity.inventory.InvProductEntity">
SELECT *
FROM inv_product
<where>
relIdFk = #{relIdFk}
and invStorageCode = #{invStorageCode}
@ -86,6 +91,18 @@
</where>
</select>
<select id="selectExit" parameterType="Map"
resultType="com.glxp.sale.admin.entity.inventory.InvProductEntity">
SELECT *
FROM inv_product
<where>
relIdFk = #{relIdFk}
</where>
limit 1
</select>
<!-- -->
<select id="filterJoinInvProduct" parameterType="com.glxp.sale.admin.req.inventory.FilterInvProductRequest"
resultType="com.glxp.sale.admin.res.inventory.InvProductResponse">
@ -97,7 +114,7 @@
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
inv_product.inCount,inv_product.outCount
,inv_product.reCount,inv_product.customerId,basic_corp.name companyName,inv_product.unitFk,inv_product.supId
,inv_warehouse.name invStorageName
,inv_warehouse.name invStorageName,inv_product.invStorageCode
FROM inv_product
inner join basic_udirel on inv_product.relIdFk = basic_udirel.id
inner join basic_products on basic_udirel.uuid = basic_products.uuid

25
api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml
Unescape Escape View File

@ -5,34 +5,35 @@
<select id="filterInvWarehouse" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
SELECT * FROM inv_warehouse
select * ,(select name from inv_warehouse WHERE a.pcode = code) pName
FROM inv_warehouse a
<where>
<if test="id != '' and id != null">
AND id = #{id}
AND a.id = #{id}
</if>
<if test="pid != '' and pid != null">
AND pid = #{pid}
AND a.pid = #{pid}
</if>
<if test="code != '' and code != null">
AND code = #{code}
AND a.code = #{code}
</if>
<if test="name != '' and name != null">
AND name = #{name}
AND a.name = #{name}
</if>
<if test="advanceType != null">
AND advanceType = #{advanceType}
AND a.advanceType = #{advanceType}
</if>
<if test="status != null">
AND status = #{status}
AND a.status = #{status}
</if>
<if test="isDefault != null">
AND isDefault = #{isDefault}
AND a.isDefault = #{isDefault}
</if>
<if test="pcode != null">
AND pcode = #{pcode}
AND a.pcode = #{pcode}
</if>
<if test="level != null">
AND level = #{level}
AND a.level = #{level}
</if>
</where>
@ -221,6 +222,8 @@
</insert>
<update id="updateThridId" statementType="STATEMENT">
update inv_warehouse set ${sysId} = ${thridWarehouseId} where id = ${id}
update inv_warehouse
set ${sysId} = ${thridWarehouseId}
where id = ${id}
</update>
</mapper>
Write Preview
Loading…
Cancel
Save