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

文件相互转换，基础信息等优化

Browse Source
master
anthonywj 4 years ago
parent e251b28f04
commit 6e864adaf8
46 changed files with 1048 additions and 143 deletions
Show Stats Download Patch File Download Diff File

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

@ -30,6 +30,7 @@ public class ConstantStatus {
public static String SORDER_ALLOC = "2";//未配货 public static String SORDER_ALLOC = "2";//未配货
public static String SORDER_CHECK = "3";//待校验 public static String SORDER_CHECK = "3";//待校验
public static String SORDER_CHECKED = "4";//已校验 public static String SORDER_CHECKED = "4";//已校验
public static String SORDER_DELIVER = "5";//已送货
public static String SORDER_PRINT_UN = "101";//101：未打印，102：已打印 public static String SORDER_PRINT_UN = "101";//101：未打印，102：已打印
public static String SORDER_PRINT_ED = "102";// public static String SORDER_PRINT_ED = "102";//

15
api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java
Unescape Escape View File

@ -48,6 +48,7 @@ public class LoginController {
/** /**
* 用户登录 * 用户登录
*
* @return * @return
*/ */
@PostMapping(value = "/login") @PostMapping(value = "/login")
@ -57,8 +58,11 @@ public class LoginController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
AuthAdmin authAdmin;
AuthAdmin authAdmin = authAdminService.findByUserName(loginRequest.getUsername()); if (loginRequest.getType() != null && loginRequest.getType() == 1) {
authAdmin = authAdminService.findByUser(loginRequest.getUsername(), "110");
} else
authAdmin = authAdminService.findByUserName(loginRequest.getUsername());
if (authAdmin == null) { if (authAdmin == null) {
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
} }
@ -90,6 +94,7 @@ public class LoginController {
/** /**
* 获取登录用户信息 * 获取登录用户信息
*
* @return * @return
*/ */
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@ -106,7 +111,7 @@ public class LoginController {
BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); BeanUtils.copyProperties(authAdmin, loginUserInfoResponse);
loginUserInfoResponse.setAuthRules(authRules); loginUserInfoResponse.setAuthRules(authRules);
CompanyEntity companyEntity = companyService.findCompany(loginUserInfoResponse.getCustomerId()); CompanyEntity companyEntity = companyService.findCompany(loginUserInfoResponse.getCustomerId());
loginUserInfoResponse.setCompanyName(companyEntity.getCompanyName()); loginUserInfoResponse.setCompanyName(companyEntity.getCompanyName());
@ -115,15 +120,17 @@ public class LoginController {
/** /**
* 登出 * 登出
*
* @return * @return
*/ */
@PostMapping("/admin/auth/login/out") @PostMapping("/admin/auth/login/out")
public BaseResponse out(){ public BaseResponse out() {
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
/** /**
* 修改密码 * 修改密码
*
* @return * @return
*/ */
@AuthRuleAnnotation("") // 需要登录验证,但是不需要权限验证时,value 值填空字符串 @AuthRuleAnnotation("") // 需要登录验证,但是不需要权限验证时,value 值填空字符串

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

@ -90,4 +90,26 @@ public class BussinessLocalTypeController {
} }
@PostMapping("/udiwms/localBusType/add")
public BaseResponse addBussinessType(@RequestBody BussinessLocalTypeEntity bussinessTypeEntity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (bussinessTypeEntity != null) {
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessTypeService.findBTByAction(bussinessTypeEntity.getAction());
if (bussinessLocalTypeEntity != null) {
ResultVOUtils.error(999, "业务类型已存在！");
} else {
bussinessTypeService.insertBussinessType(bussinessTypeEntity);
}
} else {
ResultVOUtils.error(999, "参数错误");
}
return ResultVOUtils.success("更新成功");
}
} }

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

@ -176,7 +176,10 @@ public class CorpImportLogController {
for (int k = sheet.getFirstRowNum() + 1; k <= sheet.getLastRowNum(); k++) { for (int k = sheet.getFirstRowNum() + 1; k <= sheet.getLastRowNum(); k++) {
row = sheet.getRow(k); row = sheet.getRow(k);
if (row.getRowNum() <= 0) { if (row == null || row.getRowNum() <= 0) {
continue;
}
if (filterEmpty(row)) {
continue; continue;
} }
CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity(); CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity();
@ -371,5 +374,44 @@ public class CorpImportLogController {
basicCorpImportService.importCorps(genKey); basicCorpImportService.importCorps(genKey);
return ResultVOUtils.success("上传成功"); return ResultVOUtils.success("上传成功");
} }
public boolean filterEmpty(Row row) {
if (row.getCell(0) != null) {
row.getCell(0).setCellType(CellType.STRING);
}
if (row.getCell(1) != null) {
row.getCell(1).setCellType(CellType.STRING);
}
if (row.getCell(2) != null) {
row.getCell(2).setCellType(CellType.STRING);
}
if (row.getCell(3) != null) {
row.getCell(3).setCellType(CellType.STRING);
}
if (row.getCell(4) != null) {
row.getCell(4).setCellType(CellType.STRING);
}
if (row.getCell(5) != null) {
row.getCell(5).setCellType(CellType.STRING);
}
if (row.getCell(6) != null) {
row.getCell(6).setCellType(CellType.STRING);
}
if ((row.getCell(0) == null && row.getCell(1) == null && row.getCell(2) == null
&& row.getCell(3) == null && row.getCell(4) == null && row.getCell(5) == null && row.getCell(6) == null) ||
(
(row.getCell(0) != null && row.getCell(1) != null && row.getCell(2) != null
&& row.getCell(3) != null && row.getCell(4) != null && row.getCell(5) != null && row.getCell(6) != null) &&
("".equals(row.getCell(0).getStringCellValue())
&& "".equals(row.getCell(1).getStringCellValue())
&& "".equals(row.getCell(2).getStringCellValue())
&& "".equals(row.getCell(3).getStringCellValue())
&& "".equals(row.getCell(4).getStringCellValue())
&& "".equals(row.getCell(5).getStringCellValue())
&& "".equals(row.getCell(6).getStringCellValue()))
)) {
return true;
}
return false;
}
} }

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

@ -167,7 +167,10 @@ public class UdiInfoImportLogController {
} }
for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) { for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) {
row = sheet.getRow(k); row = sheet.getRow(k);
if (row.getRowNum() <= 0) { if (row == null || row.getRowNum() <= 0) {
continue;
}
if (filterEmpty(row)) {
continue; continue;
} }
UdiInfoImportDetailEntity udiInfoImportEntity = new UdiInfoImportDetailEntity(); UdiInfoImportDetailEntity udiInfoImportEntity = new UdiInfoImportDetailEntity();
@ -328,5 +331,44 @@ public class UdiInfoImportLogController {
return ResultVOUtils.success("后台已开始下载并更新，请稍后刷新查看!"); return ResultVOUtils.success("后台已开始下载并更新，请稍后刷新查看!");
} }
public boolean filterEmpty(Row row) {
if (row.getCell(0) != null) {
row.getCell(0).setCellType(CellType.STRING);
}
if (row.getCell(1) != null) {
row.getCell(1).setCellType(CellType.STRING);
}
if (row.getCell(2) != null) {
row.getCell(2).setCellType(CellType.STRING);
}
if (row.getCell(3) != null) {
row.getCell(3).setCellType(CellType.STRING);
}
if (row.getCell(4) != null) {
row.getCell(4).setCellType(CellType.STRING);
}
if (row.getCell(5) != null) {
row.getCell(5).setCellType(CellType.STRING);
}
if (row.getCell(6) != null) {
row.getCell(6).setCellType(CellType.STRING);
}
if ((row.getCell(0) == null && row.getCell(1) == null && row.getCell(2) == null
&& row.getCell(3) == null && row.getCell(4) == null && row.getCell(5) == null && row.getCell(6) == null) ||
(
(row.getCell(0) != null && row.getCell(1) != null && row.getCell(2) != null
&& row.getCell(3) != null && row.getCell(4) != null && row.getCell(5) != null && row.getCell(6) != null) &&
("".equals(row.getCell(0).getStringCellValue())
&& "".equals(row.getCell(1).getStringCellValue())
&& "".equals(row.getCell(2).getStringCellValue())
&& "".equals(row.getCell(3).getStringCellValue())
&& "".equals(row.getCell(4).getStringCellValue())
&& "".equals(row.getCell(5).getStringCellValue())
&& "".equals(row.getCell(6).getStringCellValue()))
)) {
return true;
}
return false;
}
} }

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

@ -48,14 +48,15 @@ public class CompanyProductRelevanceController {
} }
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null; List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
companyProductRelevanceResponse.setDiType(1);
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceResponse); basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceResponse);
if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) { // if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) {
for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) { // for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) {
if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) { // if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) {
basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm()); // basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm());
} // }
} // }
} // }
PageInfo<CompanyProductRelevanceResponse> pageInfo; PageInfo<CompanyProductRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);

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

@ -3,13 +3,11 @@ package com.glxp.sale.admin.controller.inout;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.sale.admin.controller.inout.utils.DataTransUtil;
import com.glxp.sale.admin.controller.inout.utils.InoutUtils; import com.glxp.sale.admin.controller.inout.utils.InoutUtils;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.inout.ErpOrderEntity;
import com.glxp.sale.admin.entity.inout.FilterErpOrderRequest;
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.entity.udid.UdiEntity;
import com.glxp.sale.admin.httpclient.ErpOrderClient; import com.glxp.sale.admin.httpclient.ErpOrderClient;
import com.glxp.sale.admin.req.inout.*; import com.glxp.sale.admin.req.inout.*;
@ -18,10 +16,12 @@ import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.inout.StockOrderService;
import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.inout.CodesService; import com.glxp.sale.admin.service.inout.CodesService;
import com.glxp.sale.admin.service.inout.OrderDetailService; import com.glxp.sale.admin.service.inout.OrderDetailService;
import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.service.inout.OrderService;
import com.glxp.sale.admin.thread.InvProductsTrService;
import com.glxp.sale.admin.thread.IoTransInoutService; import com.glxp.sale.admin.thread.IoTransInoutService;
import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.admin.util.FilterUdiUtils;
import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.enums.ResultEnum;
@ -60,6 +60,10 @@ public class OrderController {
private String ucloudUrl; private String ucloudUrl;
@Resource @Resource
IoTransInoutService ioTransInoutService; IoTransInoutService ioTransInoutService;
@Resource
StockOrderService stockOrderService;
@Resource
InvProductsTrService invProductsTrService;
@GetMapping("udiwms/inout/order/getUdi") @GetMapping("udiwms/inout/order/getUdi")
public BaseResponse getUdi(@RequestParam("code") String code) { public BaseResponse getUdi(@RequestParam("code") String code) {
@ -170,6 +174,65 @@ public class OrderController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
//手持终端下载订单校验
@GetMapping("/udiwms/inout/order/download")
public BaseResponse downloadOrder(OrderFilterRequest orderFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<OrderEntity> orderEntityList;
if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) {
orderFilterRequest.setStatus(4);
orderFilterRequest.setContrastStatus(2);
orderFilterRequest.setReceiveStatus(0);
// orderFilterRequest.setStatusOrOne(3);
}
if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) {
List<WarehouseEntity> warehouseEntityList = codesService.findByCode(orderFilterRequest.getCode());
orderEntityList = orderService.filterListByCode(warehouseEntityList);
} else {
orderEntityList = orderService.filterListOr(orderFilterRequest);
}
PageInfo<OrderEntity> pageInfo;
pageInfo = new PageInfo<>(orderEntityList);//TODO 已完成单据列表
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(orderEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
//手持终端验收完成后，更新订单状态
@PostMapping("/spms/inout/order/check/updateStatus")
public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId());
orderEntity.setReceiveStatus(1);
orderService.updateOrder(orderEntity);
List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
if (erpIds != null && erpIds.size() > 0) {
for (String id : erpIds) {
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
stockOrderFilterRequest.setBillNo(id);
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER);
stockOrderService.updateById(stockOrderEntity);
}
}
invProductsTrService.genInvProducts(orderEntity.getId());
return ResultVOUtils.success("更新成功");
}
@GetMapping("/udiwms/inout/order/filterCode") @GetMapping("/udiwms/inout/order/filterCode")
public BaseResponse filterOrderByCode(OrderFilterByCodeRequest orderFilterByCodeRequest, public BaseResponse filterOrderByCode(OrderFilterByCodeRequest orderFilterByCodeRequest,
BindingResult bindingResult) { BindingResult bindingResult) {

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

@ -2,7 +2,9 @@ package com.glxp.sale.admin.controller.inout;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.controller.inout.utils.CheckOrderUtils;
import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.sale.admin.controller.inout.utils.DataTransUtil;
import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.CompanyEntity;
@ -25,6 +27,7 @@ import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.service.inout.*;
import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.thrsys.ThrDataService;
import com.glxp.sale.admin.service.thrsys.ThrOrderDetailService; import com.glxp.sale.admin.service.thrsys.ThrOrderDetailService;
import com.glxp.sale.admin.service.thrsys.ThrOrderService; import com.glxp.sale.admin.service.thrsys.ThrOrderService;
import com.glxp.sale.admin.thread.InvDlErpStockService; import com.glxp.sale.admin.thread.InvDlErpStockService;
@ -66,6 +69,8 @@ public class OrderDetailController {
private UdiRelevanceService udiRelevanceService; private UdiRelevanceService udiRelevanceService;
@Resource @Resource
private InvDlErpStockService dlErpStockService; private InvDlErpStockService dlErpStockService;
@Resource
private CheckOrderUtils checkOrderUtils;
@Resource @Resource
@ -87,6 +92,8 @@ public class OrderDetailController {
private CompanyService companyService; private CompanyService companyService;
@Resource @Resource
private BussinessTypeService bussinessTypeService; private BussinessTypeService bussinessTypeService;
@Resource
ThrDataService thrDataService;
@GetMapping("/udiwms/erpOrder/filter") @GetMapping("/udiwms/erpOrder/filter")
public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest, public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest,
@ -123,6 +130,8 @@ public class OrderDetailController {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder(); ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder();
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder);
subErpOrder.setCount(thrOrderDetailEntity.getCount()+"");
subErpOrder.setReCount(thrOrderDetailEntity.getReCount()+"");
subErpOrders.add(subErpOrder); subErpOrders.add(subErpOrder);
} }
} }
@ -151,13 +160,20 @@ public class OrderDetailController {
if (thrOrderEntity == null) { if (thrOrderEntity == null) {
return ResultVOUtils.error(ResultEnum.DATA_NOT); return ResultVOUtils.error(ResultEnum.DATA_NOT);
} }
StockOrderEntity temp = stockOrderService.findByBillNo(thrOrderEntity.getBillNo() + "");
if(temp!=null){
return ResultVOUtils.error(500,"单据已被选入，请勿重复选入！");
}
StockOrderEntity stockOrderEntity = new StockOrderEntity(); StockOrderEntity stockOrderEntity = new StockOrderEntity();
BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity); BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderEntity.getBillType()); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderEntity.getBillType());
stockOrderEntity.setBillType(bussinessTypeEntity.getLocalAction()); stockOrderEntity.setBillType(bussinessTypeEntity.getLocalAction());
stockOrderEntity.setId(null); stockOrderEntity.setId(null);
stockOrderEntity.setStatus(ConstantStatus.SORDER_DRAFT);//未提交 stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交
stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交 stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交
stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印 stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印
stockOrderEntity.setBilldate(DateUtil.formatDate(new Date())); stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
@ -332,9 +348,11 @@ public class OrderDetailController {
erpOrderEntity.setCredate(purchaseinResponse.getBilldate()); erpOrderEntity.setCredate(purchaseinResponse.getBilldate());
erpOrderEntity.setGoodsid(subPurchase.getProductId()); erpOrderEntity.setGoodsid(subPurchase.getProductId());
erpOrderEntity.setGoodsname(subPurchase.getProductName()); erpOrderEntity.setGoodsname(subPurchase.getProductName());
erpOrderEntity.setProductDate(subPurchase.getProductDate());
erpOrderEntity.setExpireDate(subPurchase.getExpireDate());
erpOrderEntity.setBatchNo(subPurchase.getBatchNo()); erpOrderEntity.setBatchNo(subPurchase.getBatchNo());
erpOrderEntity.setErpCount(Math.abs(subPurchase.getCount())); erpOrderEntity.setErpCount(Math.abs(Integer.parseInt(subPurchase.getCount())));
erpOrderEntity.setReCount(Math.abs(subPurchase.getReCount())); erpOrderEntity.setReCount(Math.abs(Integer.parseInt(subPurchase.getReCount())));
erpOrderEntity.setGoodsunit(subPurchase.getSpec()); erpOrderEntity.setGoodsunit(subPurchase.getSpec());
erpOrderEntities.add(erpOrderEntity); erpOrderEntities.add(erpOrderEntity);
} }
@ -351,7 +369,6 @@ public class OrderDetailController {
OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setId(importErpOrderRequest.getOrderId()); orderFilterRequest.setId(importErpOrderRequest.getOrderId());
OrderEntity orderEntity = orderService.findOne(orderFilterRequest); OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId()); ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId());
if (exitErp != null) { if (exitErp != null) {
String errMsg = "所选ERP单" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定"; String errMsg = "所选ERP单" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定";
@ -362,12 +379,15 @@ public class OrderDetailController {
orderEntity.setErpFk(docidStr); orderEntity.setErpFk(docidStr);
orderService.updateOrder(orderEntity); orderService.updateOrder(orderEntity);
} }
orderDetailService.deleteByOrderId(importErpOrderRequest.getOrderId()); orderDetailService.deleteByOrderId(importErpOrderRequest.getOrderId());
List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, importErpOrderRequest.getOrderId());
orderDetailService.insertErpOrders(returnOrders);
List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId()); List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId());
new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, orderDetailService, orderService, warehouseEntityList, systemParamConfigService, bussinessTypeEntity); transInoutService.genOrderDetail(warehouseEntityList);
checkOrderUtils.check(orderEntity.getId(), erpOrderEntities);
// List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, importErpOrderRequest.getOrderId());
// orderDetailService.insertErpOrders(returnOrders);
// List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId());
// new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, orderDetailService, orderService, warehouseEntityList, systemParamConfigService, bussinessTypeEntity);
} else { } else {
@ -400,7 +420,17 @@ public class OrderDetailController {
OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setId(filterErpOrderRequest.getOrderId()); orderFilterRequest.setId(filterErpOrderRequest.getOrderId());
OrderEntity orderEntity = orderService.findOne(orderFilterRequest); OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
transInoutService.repeatPrint(orderEntity); List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
if (erpIds != null && erpIds.size() > 0) {
List<ErpOrderEntity> erpOrderEntities = thrDataService.getStockOrders(erpIds);
orderDetailService.deleteByOrderId(orderEntity.getId());
List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(orderEntity.getId());
transInoutService.genOrderDetail(warehouseEntityList);
checkOrderUtils.check(orderEntity.getId(), erpOrderEntities);
}
// transInoutService.repeatPrint(orderEntity);
return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！"); return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！");
} }
} }

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

@ -25,6 +25,7 @@ import com.glxp.sale.admin.req.param.SystemParamConfigRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.sale.admin.req.thrsys.FilterThrOrderDetailRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest; import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.res.inout.ErpOrderResponse; import com.glxp.sale.admin.res.inout.ErpOrderResponse;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.basic.UdiRelevanceService;
@ -371,9 +372,10 @@ public class StockOrderController {
List<StockPrintEntity> stockPrintEntities = new ArrayList<>(); List<StockPrintEntity> stockPrintEntities = new ArrayList<>();
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
if (stockOrderIdsRequest.isFilterUDIType()) { if (stockOrderIdsRequest.isFilterUDIType()) {
UdiInfoEntity udiInfoEntity = // UdiInfoEntity udiInfoEntity =
udiInfoService.findByNameCode(stockOrderDetailEntity.getProductId()); // udiInfoService.findByNameCode(stockOrderDetailEntity.getProductId());
if (udiInfoEntity.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {//TODO udi过滤检测 UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId());
if (udiRelevanceResponse != null && udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {//TODO udi过滤检测
StockPrintEntity stockPrintEntity = new StockPrintEntity(); StockPrintEntity stockPrintEntity = new StockPrintEntity();
stockPrintEntity.setSOrderId(stockOrderEntity.getId()); stockPrintEntity.setSOrderId(stockOrderEntity.getId());
stockPrintEntity.setUpdateTime(new Date()); stockPrintEntity.setUpdateTime(new Date());
@ -384,7 +386,7 @@ public class StockOrderController {
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId()); stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntities.add(stockPrintEntity); stockPrintEntities.add(stockPrintEntity);
} }
}else { } else {
StockPrintEntity stockPrintEntity = new StockPrintEntity(); StockPrintEntity stockPrintEntity = new StockPrintEntity();
stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId()); stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId());
stockPrintEntity.setSOrderId(stockOrderEntity.getId()); stockPrintEntity.setSOrderId(stockOrderEntity.getId());
@ -430,7 +432,7 @@ public class StockOrderController {
for (StockPrintEntity stockPrintEntity : stockPrintEntities) { for (StockPrintEntity stockPrintEntity : stockPrintEntities) {
StockPrinttREntity stockPrinttREntity = new StockPrinttREntity(); StockPrinttREntity stockPrinttREntity = new StockPrinttREntity();
BeanUtils.copyProperties(stockPrintEntity,stockPrinttREntity); BeanUtils.copyProperties(stockPrintEntity, stockPrinttREntity);
stockPrintEntity.setGenKeyFk(genKey); stockPrintEntity.setGenKeyFk(genKey);
String udiCode = "#" + stockPrinttREntity.getNameCode() + "#" + stockPrinttREntity.getProduceDate() + "#" + stockPrinttREntity.getExpireDate() + String udiCode = "#" + stockPrinttREntity.getNameCode() + "#" + stockPrinttREntity.getProduceDate() + "#" + stockPrinttREntity.getExpireDate() +
"#" + stockPrinttREntity.getBatchNo() + "#" + stockPrinttREntity.getSerialNo() + "#" + stockPrinttREntity.getWarehouseCode() + "#" + stockPrinttREntity.getSpaceCode(); "#" + stockPrinttREntity.getBatchNo() + "#" + stockPrinttREntity.getSerialNo() + "#" + stockPrinttREntity.getWarehouseCode() + "#" + stockPrinttREntity.getSpaceCode();

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

@ -232,12 +232,13 @@ public class StockOrderDetailController {
for (String id : stockOrderIdsRequest.getIds()) { for (String id : stockOrderIdsRequest.getIds()) {
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
companyProductRelevanceRequest.setId(id); companyProductRelevanceRequest.setId(id);
companyProductRelevanceRequest.setDiType(1);
List<CompanyProductRelevanceResponse> companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); List<CompanyProductRelevanceResponse> companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) { if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) {
CompanyProductRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0); CompanyProductRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0);
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
stockOrderDetailEntity.setProductId(udiInfoEntity.getThirdId()); stockOrderDetailEntity.setProductId(udiInfoEntity.getRlId()+"");
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc()); stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh()); stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
if (stockOrderIdsRequest.getUdiEntity() != null) { if (stockOrderIdsRequest.getUdiEntity() != null) {
@ -392,16 +393,18 @@ public class StockOrderDetailController {
filterUdiInfoRequest.setNameCode(nameCode); filterUdiInfoRequest.setNameCode(nameCode);
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest); BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest);
companyProductRelevanceRequest.setDiType(1);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null; List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) {
for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) { //todo 为什么要把去掉使用单元
if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) { // if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) {
basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm()); // for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) {
} // if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) {
} // basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm());
} // }
// }
// }
PageInfo<CompanyProductRelevanceResponse> pageInfo; PageInfo<CompanyProductRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);

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

@ -134,6 +134,17 @@ public class WareHouseController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@GetMapping("spms/inout/dlcode/findByOrderId")
public BaseResponse downloadCodesByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
List<WarehouseEntity> warehouseEntityList = codesService.findByOrderId(warehouseQueryRequest);
PageInfo<WarehouseEntity> pageInfo;
pageInfo = new PageInfo<>(warehouseEntityList);
PageSimpleResponse<WarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(warehouseEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("admin/warehouse/inout/findAllByOrderId") @GetMapping("admin/warehouse/inout/findAllByOrderId")
public BaseResponse findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) { public BaseResponse findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
List<WarehouseEntity> warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest); List<WarehouseEntity> warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest);

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

@ -0,0 +1,250 @@
package com.glxp.sale.admin.controller.inout.utils;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.inout.StockOrderFilterRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.inout.OrderDetailService;
import com.glxp.sale.admin.service.inout.OrderService;
import com.glxp.sale.admin.service.inout.StockOrderService;
import com.glxp.sale.admin.service.thrsys.ThrDataService;
import com.glxp.sale.admin.thread.InvProductsTrService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class CheckOrderUtils {
@Resource
private OrderDetailService myErpOrderService;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
private OrderService orderService;
@Resource
StockOrderService stockOrderService;
@Resource
InvProductsTrService invProductsTrService;
public void check(String orderId, List<ErpOrderEntity> vailOrderEntities) {
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderId);
List<ErpOrderEntity> myErpOrders = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
OrderEntity orderEntity = orderService.findById(orderId);
String errMsg = null;
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) {
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;
}
}
}
if (checkId(vailOrderEntity, udiRelevanceResponse) == null
&& checkBatchNo(vailOrderEntity, myErpOrder) == null
&& checkProductDate(vailOrderEntity, myErpOrder) == null
&& checkExpireDate(vailOrderEntity, myErpOrder) == null
&& checkWarehouse(vailOrderEntity, myErpOrder) == null
&& checkCount(vailOrderEntity, myErpOrder) == null
) {
myErpOrder.setErpCount(vailOrderEntity.getErpCount());
myErpOrder.setReCount(vailOrderEntity.getReCount());
myErpOrder.setGoodsname(vailOrderEntity.getGoodsname());
myErpOrder.setGoodsid(vailOrderEntity.getGoodsid());
myErpOrder.setStatus("success");
vailOrderEntity.setStatus("success");
myErpOrderService.updateErpOrder(myErpOrder);
break;
} else {
errMsg = checkBatchNo(vailOrderEntity, myErpOrder);
if (errMsg == null) {
errMsg = checkId(vailOrderEntity, udiRelevanceResponse);
if (errMsg == null) {
errMsg = checkProductDate(vailOrderEntity, myErpOrder);
if (errMsg == null) {
errMsg = checkExpireDate(vailOrderEntity, myErpOrder);
if (errMsg == null) {
errMsg = checkWarehouse(vailOrderEntity, myErpOrder);
if (errMsg == null) {
errMsg = checkCount(vailOrderEntity, myErpOrder);
if (errMsg != null) {
myErpOrder.setErpCount(vailOrderEntity.getErpCount());
myErpOrder.setReCount(vailOrderEntity.getReCount());
myErpOrder.setGoodsname(vailOrderEntity.getGoodsname());
myErpOrder.setGoodsid(vailOrderEntity.getGoodsid());
myErpOrder.setStatus("fail");
vailOrderEntity.setStatus("fail");
myErpOrderService.updateErpOrder(myErpOrder);
break;
}
}
}
}
}
}
}
}
}
}
if (checkFinish(myErpOrders, vailOrderEntities)) {
orderEntity.setRemark("校验成功");
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS);
orderService.updateOrder(orderEntity);
//更新业务单据为已校验
List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
if (erpIds != null && erpIds.size() > 0) {
for (String id : erpIds) {
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
stockOrderFilterRequest.setBillNo(id);
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
stockOrderService.updateById(stockOrderEntity);
}
}
//生产库存
// invProductsTrService.genInvProducts(orderEntity.getId());
} else {
for (ErpOrderEntity erpOrderEntity : vailOrderEntities) {
if (!checkErpOrderExit(myErpOrders, erpOrderEntity)) {
erpOrderEntity.setOrderIdFk(orderId);
erpOrderEntity.setCoName(erpOrderEntity.getGoodsname());
erpOrderEntity.setPackSpec(erpOrderEntity.getGoodsunit());
myErpOrderService.insertErpOrder(erpOrderEntity);
}
}
orderEntity.setRemark(errMsg);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
orderService.updateOrder(orderEntity);
}
}
//校验选入业务单据是否多出，多出，则添加到详情
public boolean checkErpOrderExit(List<ErpOrderEntity> myErpOrders, ErpOrderEntity vailErpEntity) {
for (ErpOrderEntity myErp : myErpOrders) {
if (myErp.getGoodsid() != null && vailErpEntity.getGoodsid().equals(myErp.getGoodsid())) {
return true;
}
}
return false;
}
//是否全部校验完成
public boolean checkFinish(List<ErpOrderEntity> myErpOrders, List<ErpOrderEntity> vailOrders) {
for (ErpOrderEntity myErpOrder : myErpOrders) {
if (!"success".equals(myErpOrder.getStatus())) {
return false;
}
}
for (ErpOrderEntity myErpOrder : vailOrders) {
if (!"success".equals(myErpOrder.getStatus())) {
return false;
}
}
return true;
}
public String checkId(ErpOrderEntity vailOrderEntity, UdiRelevanceResponse udiRelevanceResponse) {
if (vailOrderEntity.getGoodsid() != null && udiRelevanceResponse != null) {
if (vailOrderEntity.getGoodsid().equals(udiRelevanceResponse.getId() + ""))
return null;
} else {
return "产品ID不匹配！";
}
return "产品信息未找到！";
}
public String checkBatchNo(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
if (vailOrderEntity.getGoodsid() != null && myErpOrder.getBatchNo() != null) {
if (vailOrderEntity.getBatchNo().equals(myErpOrder.getBatchNo()))
return null;
} else if (vailOrderEntity.getGoodsid() == null && myErpOrder.getBatchNo() == null) {
return null;
} else {
return myErpOrder.getCoName() + "批次号不匹配！";
}
return "批次号不匹配！";
}
public String checkProductDate(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
if (vailOrderEntity.getProductDate() != null && myErpOrder.getProductDate() != null) {
if (vailOrderEntity.getProductDate().equals(myErpOrder.getProductDate()))
return null;
} else if (vailOrderEntity.getProductDate() == null && myErpOrder.getProductDate() == null) {
return null;
} else {
return myErpOrder.getCoName() + "生产日期不匹配！";
}
return "生产日期不匹配！";
}
public String checkExpireDate(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
if (vailOrderEntity.getExpireDate() != null && myErpOrder.getExpireDate() != null) {
if (vailOrderEntity.getExpireDate().equals(myErpOrder.getExpireDate()))
return null;
} else if (vailOrderEntity.getExpireDate() == null && myErpOrder.getExpireDate() == null) {
return null;
} else {
return myErpOrder.getCoName() + "失效日期不匹配！";
}
return "失效日期不匹配！";
}
public String checkWarehouse(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
if (vailOrderEntity.getWarehouseCode() != null && myErpOrder.getWarehouseCode() != null) {
if (vailOrderEntity.getWarehouseCode().equals(myErpOrder.getWarehouseCode()))
return null;
} else if (vailOrderEntity.getWarehouseCode() == null && myErpOrder.getWarehouseCode() == null) {
return null;
} else {
return myErpOrder.getCoName() + "仓位号不匹配！";
}
return "仓位号不匹配！";
}
public String checkCount(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
if (vailOrderEntity.getReCount() != null && myErpOrder.getCount() != null) {
if (vailOrderEntity.getReCount() == myErpOrder.getCount())
return null;
}
return myErpOrder.getCoName() + "数量不匹配！";
}
}

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

@ -21,6 +21,8 @@ import com.glxp.sale.admin.service.inout.OrderDetailService;
import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.service.inout.OrderService;
import com.glxp.sale.admin.thread.InvProductsTrService; import com.glxp.sale.admin.thread.InvProductsTrService;
import com.glxp.sale.admin.thread.IoTransInoutService; import com.glxp.sale.admin.thread.IoTransInoutService;
import com.glxp.sale.admin.util.FilterUdiUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -40,6 +42,10 @@ public class ContrastErpUtil {
IoTransInoutService ioTransInoutService; IoTransInoutService ioTransInoutService;
@Resource @Resource
InvProductsTrService InvProductsTrService; InvProductsTrService InvProductsTrService;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
private OrderDetailService myErpOrderService;
public ContrastErpUtil() { public ContrastErpUtil() {
@ -53,6 +59,7 @@ public class ContrastErpUtil {
OrderDetailService orderDetailService, OrderDetailService orderDetailService,
OrderService orderService, OrderService orderService,
List<WarehouseEntity> warehouseEntityList, SystemParamConfigService setupService, BussinessTypeEntity bussinessTypeEntity) { List<WarehouseEntity> warehouseEntityList, SystemParamConfigService setupService, BussinessTypeEntity bussinessTypeEntity) {
//单据详情初始化
String orderIdFk = warehouseEntityList.get(0).getOrderId(); String orderIdFk = warehouseEntityList.get(0).getOrderId();
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderIdFk); filterErpOrderRequest.setOrderId(orderIdFk);
@ -64,8 +71,60 @@ public class ContrastErpUtil {
} }
String errMsg = null; String errMsg = null;
String resultMsg = null; String resultMsg = null;
//获取当前订单
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setId(orderIdFk);
OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
//校验单据详情是否有包含一个di多个绑定
String erpMsg = vailMutiDi();
if (erpMsg != null) {
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
orderEntity.setRemark(errMsg);
orderService.updateOrder(orderEntity);
return;
}
//校验业务单据是否被其他扫码单校验
ErpOrderEntity vailExitMsg = vailErpExit(orderDetailService, mErpOrderEntities, orderIdFk);
SystemParamConfigRequest systemParamConfigRequest = new SystemParamConfigRequest();
systemParamConfigRequest.setParamKey("erp_forbidSameErp");
SystemParamConfigEntity systemParamConfigEntity = setupService.selectByParamKey(systemParamConfigRequest);
if (vailExitMsg != null && systemParamConfigEntity != null && systemParamConfigEntity.getParamValue().equals("1")) {
errMsg = "所选ERP单" + vailExitMsg.getErpOrderId() + "已被其他出入库单" + vailExitMsg.getOrderIdFk() + "绑定！";
}
//开始校验
List<WarehouseEntity> errorData = new ArrayList<>(); List<WarehouseEntity> errorData = new ArrayList<>();
for (WarehouseEntity warehouseEntity : warehouseEntityList) { for (WarehouseEntity warehouseEntity : warehouseEntityList) {
// if (warehouseEntity.getCode().substring(0, 1).equals("#")) {
// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(warehouseEntity.getNameCode());
// if (udiRelevanceResponse != null) {
// //校验单据详情
// errMsg = vaildOrder(warehouseEntityList, warehouseEntity, udiRelevanceResponse);
// if (errMsg != null && (errMsg.equals("产品信息不匹配") || errMsg.equals("非此单产品批次号"))) {
// errorData.add(warehouseEntity);
// }
// } else {
// errMsg = "产品信息未维护";
// errorData.add(warehouseEntity);
// }
//
// } else {
//
// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
// filterUdiInfoRequest.setNameCode(warehouseEntity.getNameCode());
// List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
// if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && erpOrderEntity.getBindRlFk() == null) {
// erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
// myErpOrderService.updateErpOrder(erpOrderEntity);
// errMsg = "该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID";
// }
//
// }
UdiInfoEntity udiInfoEntity = new InoutUtils(udiUrl).getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); UdiInfoEntity udiInfoEntity = new InoutUtils(udiUrl).getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
if (warehouseEntity.getCount() > 1) { if (warehouseEntity.getCount() > 1) {
udiInfoEntity.setCount(warehouseEntity.getCount()); udiInfoEntity.setCount(warehouseEntity.getCount());
@ -94,17 +153,7 @@ public class ContrastErpUtil {
} }
} }
orderDetailService.insertErpOrders(mErpOrderEntities);
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setId(orderIdFk);
OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
ErpOrderEntity vailExitMsg = vailErpExit(orderDetailService, mErpOrderEntities, orderIdFk);
SystemParamConfigRequest systemParamConfigRequest = new SystemParamConfigRequest();
systemParamConfigRequest.setParamKey("erp_forbidSameErp");
SystemParamConfigEntity systemParamConfigEntity = setupService.selectByParamKey(systemParamConfigRequest);
if (vailExitMsg != null && systemParamConfigEntity != null && systemParamConfigEntity.getParamValue().equals("1")) {
errMsg = "所选ERP单" + vailExitMsg.getErpOrderId() + "已被其他出入库单" + vailExitMsg.getOrderIdFk() + "绑定！";
}
if (mErpOrderEntities != null && mErpOrderEntities.size() > 0) if (mErpOrderEntities != null && mErpOrderEntities.size() > 0)
for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) { for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) {
if (erpOrderEntity.getErpCount() != erpOrderEntity.getCount()) { if (erpOrderEntity.getErpCount() != erpOrderEntity.getCount()) {
@ -128,6 +177,97 @@ public class ContrastErpUtil {
} }
} }
//验证产品ID,批次号，仓位号
public String vaildOrder(List<WarehouseEntity> warehouseEntityList, WarehouseEntity warehouseEntity) {
String errMsg = "产品信息不匹配";
if (mErpOrderEntities.size() > 0) {
for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) {
errMsg = vailCode(erpOrderEntity, warehouseEntity,null);
if (errMsg == null) {
int erpCount = erpOrderEntity.getCount() + warehouseEntity.getCount();
if (erpOrderEntity.getErpCount() != erpCount) {
erpOrderEntity.setCount(erpCount);
if (erpOrderEntity.getErpCount() != erpCount)
return "该" + warehouseEntity.getBatchNo() + "批次号下" + "订单数目不匹配";
}
erpOrderEntity.setCount(erpCount);
return null;
}
}
}
if (errMsg == null && getSelectedCount(warehouseEntityList) + warehouseEntity.getCount() != erpTotalCount) {
return "订单数目匹配失败";
}
return errMsg;
}
public String vailMutiDi() {
String errMsg = null;
for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(erpOrderEntity.getNameCode());
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && erpOrderEntity.getBindRlFk() == null) {
erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
myErpOrderService.updateErpOrder(erpOrderEntity);
errMsg = "该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID";
}
}
return errMsg;
}
public String vailCode(ErpOrderEntity erpOrderEntity, WarehouseEntity warehouseEntity, String udiRl) {
String errMsg = null;
if (erpOrderEntity.getBatchNo().equals(warehouseEntity.getBatchNo())) {
if (erpOrderEntity.getGoodsid().equals(udiRl)) {
if (erpOrderEntity.getWarehouseCode() != null && warehouseEntity.getWarehouseCode() != null) {
if (erpOrderEntity.getWarehouseCode().equals(warehouseEntity.getWarehouseCode())) {
return null;
} else
errMsg = "仓位号不匹配";
} else
return null;
} else
errMsg = "产品信息不匹配";
} else {
errMsg = "非此单产品批次号";
}
return errMsg;
}
public String checkRlId(ErpOrderEntity erpOrderEntity, WarehouseEntity warehouseEntity) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(warehouseEntity.getNameCode());
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceEntities.size() > 1) {
for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceEntities) {
}
}
return null;
}
public String checkBatchNo() {
return null;
}
public String checkWarehouse() {
return null;
}
public String checkProduceDate() {
return null;
}
public String checkExpireDate() {
return null;
}
public UdiRelevanceEntity checkGoodsId(List<UdiRelevanceEntity> udiRelevanceEntities, BussinessTypeEntity bussinessTypeEntity) { public UdiRelevanceEntity checkGoodsId(List<UdiRelevanceEntity> udiRelevanceEntities, BussinessTypeEntity bussinessTypeEntity) {
if (mErpOrderEntities.size() > 0) { if (mErpOrderEntities.size() > 0) {
for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) { for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) {

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

@ -10,6 +10,7 @@ import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.httpclient.UdiDlHttpClient; import com.glxp.sale.admin.httpclient.UdiDlHttpClient;
import com.glxp.sale.admin.req.param.SystemParamConfigRequest; import com.glxp.sale.admin.req.param.SystemParamConfigRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.param.SystemParamConfigService;
@ -17,6 +18,7 @@ import com.glxp.sale.admin.service.inout.CodesService;
import com.glxp.sale.admin.service.inout.OrderDetailService; import com.glxp.sale.admin.service.inout.OrderDetailService;
import com.glxp.sale.admin.util.DateUtil; import com.glxp.sale.admin.util.DateUtil;
import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.admin.util.FilterUdiUtils;
import org.springframework.beans.BeanUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -171,19 +173,37 @@ public class InoutUtils {
return udiInfoEntity; return udiInfoEntity;
} }
public UdiInfoEntity getUdiInfoByRlId(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, String code) {
String prefix;
prefix = FilterUdiUtils.getDiStr(code);
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(prefix);
BeanUtils.copyProperties(udiRelevanceResponse, udiInfoEntity);
udiInfoEntity.setCode(code);
udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity);
udiInfoEntity.setNameCode(udiRelevanceResponse.getNameCode());
return udiInfoEntity;
}
public void generateConstrastDetail(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, public void generateConstrastDetail(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService,
OrderDetailService orderDetailService, OrderDetailService orderDetailService,
List<WarehouseEntity> warehouseEntityList) { List<WarehouseEntity> warehouseEntityList) {
if (warehouseEntityList != null && warehouseEntityList.size() > 0) { if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
List<UdiInfoEntity> udiInfoEntities = new ArrayList<>(); List<UdiInfoEntity> udiInfoEntities = new ArrayList<>();
for (WarehouseEntity warehouseEntity : warehouseEntityList) { for (WarehouseEntity warehouseEntity : warehouseEntityList) {
UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); UdiInfoEntity udiInfoEntity = null;
if (warehouseEntity.getCode().substring(0, 1).equals("#")) {
udiInfoEntity = getUdiInfoByRlId(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
} else
udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
if (udiInfoEntity != null) { if (udiInfoEntity != null) {
if (warehouseEntity.getCount() != null) // if (warehouseEntity.getCount() != null)
udiInfoEntity.setCount(warehouseEntity.getCount()); // udiInfoEntity.setCount(warehouseEntity.getCount());
else { // else {
udiInfoEntity.setCount(getActCount(udiInfoEntity)); //
} // }
udiInfoEntity.setCount(getActCount(warehouseEntity, udiRelevanceService)*warehouseEntity.getCount());
udiInfoEntities.add(udiInfoEntity); udiInfoEntities.add(udiInfoEntity);
} }
} }
@ -226,14 +246,30 @@ public class InoutUtils {
} }
} }
public int getActCount(UdiInfoEntity udiInfoBean) { // public int getActCount(UdiInfoEntity udiInfoBean) {
// if (udiInfoBean != null) {
// if (udiInfoBean.getZxxsbzbhsydysl() > 1) {
// return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl();
// } else {
// return udiInfoBean.getBhzxxsbzsl();
// }
// }
// return 1;
// }
public int getActCount(WarehouseEntity warehouseEntity, UdiRelevanceService udiRelevanceService) {
UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
if (udiInfoBean != null) { if (udiInfoBean != null) {
if (udiInfoBean.getZxxsbzbhsydysl() > 1) { if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) {
return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl(); if (udiInfoBean.getBhzxxsbzsl() == 0)
return udiInfoBean.getZxxsbzbhsydysl();
else
return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl();
} else { } else {
return udiInfoBean.getBhzxxsbzsl(); return udiInfoBean.getBhzxxsbzsl();
} }
} }
return 1; return 1;
} }
} }

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

@ -168,6 +168,12 @@ public class ThrOrderImportLogController {
} }
for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) { for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) {
row = sheet.getRow(k); row = sheet.getRow(k);
if (row == null || row.getRowNum() <= 0) {
continue;
}
if (filterEmpty(row)) {
continue;
}
ThrOrderImportDetailEntity corpImportDetailEntity = new ThrOrderImportDetailEntity(); ThrOrderImportDetailEntity corpImportDetailEntity = new ThrOrderImportDetailEntity();
Cell cell1 = row.getCell(0); Cell cell1 = row.getCell(0);
if (cell1 != null) { if (cell1 != null) {
@ -282,5 +288,44 @@ public class ThrOrderImportLogController {
} }
return ResultVOUtils.success("上传成功"); return ResultVOUtils.success("上传成功");
} }
public boolean filterEmpty(Row row) {
if (row.getCell(0) != null) {
row.getCell(0).setCellType(CellType.STRING);
}
if (row.getCell(1) != null) {
row.getCell(1).setCellType(CellType.STRING);
}
if (row.getCell(2) != null) {
row.getCell(2).setCellType(CellType.STRING);
}
if (row.getCell(3) != null) {
row.getCell(3).setCellType(CellType.STRING);
}
if (row.getCell(4) != null) {
row.getCell(4).setCellType(CellType.STRING);
}
if (row.getCell(5) != null) {
row.getCell(5).setCellType(CellType.STRING);
}
if (row.getCell(6) != null) {
row.getCell(6).setCellType(CellType.STRING);
}
if ((row.getCell(0) == null && row.getCell(1) == null && row.getCell(2) == null
&& row.getCell(3) == null && row.getCell(4) == null && row.getCell(5) == null && row.getCell(6) == null) ||
(
(row.getCell(0) != null && row.getCell(1) != null && row.getCell(2) != null
&& row.getCell(3) != null && row.getCell(4) != null && row.getCell(5) != null && row.getCell(6) != null) &&
("".equals(row.getCell(0).getStringCellValue())
&& "".equals(row.getCell(1).getStringCellValue())
&& "".equals(row.getCell(2).getStringCellValue())
&& "".equals(row.getCell(3).getStringCellValue())
&& "".equals(row.getCell(4).getStringCellValue())
&& "".equals(row.getCell(5).getStringCellValue())
&& "".equals(row.getCell(6).getStringCellValue()))
)) {
return true;
}
return false;
}
} }

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

@ -143,7 +143,10 @@ public class ThrProductsImportLogController {
} }
for (int k = sheet.getFirstRowNum(); k <= sheet.getLastRowNum(); k++) { for (int k = sheet.getFirstRowNum(); k <= sheet.getLastRowNum(); k++) {
row = sheet.getRow(k); row = sheet.getRow(k);
if (row == null || row.getFirstCellNum() == k) { if (row == null || row.getRowNum() <= 0) {
continue;
}
if (filterEmpty(row)) {
continue; continue;
} }
ErpProductsResponse erpProductsResponse = new ErpProductsResponse(); ErpProductsResponse erpProductsResponse = new ErpProductsResponse();
@ -192,4 +195,44 @@ public class ThrProductsImportLogController {
} }
return ResultVOUtils.success("上传成功"); return ResultVOUtils.success("上传成功");
} }
public boolean filterEmpty(Row row) {
if (row.getCell(0) != null) {
row.getCell(0).setCellType(CellType.STRING);
}
if (row.getCell(1) != null) {
row.getCell(1).setCellType(CellType.STRING);
}
if (row.getCell(2) != null) {
row.getCell(2).setCellType(CellType.STRING);
}
if (row.getCell(3) != null) {
row.getCell(3).setCellType(CellType.STRING);
}
if (row.getCell(4) != null) {
row.getCell(4).setCellType(CellType.STRING);
}
if (row.getCell(5) != null) {
row.getCell(5).setCellType(CellType.STRING);
}
if (row.getCell(6) != null) {
row.getCell(6).setCellType(CellType.STRING);
}
if ((row.getCell(0) == null && row.getCell(1) == null && row.getCell(2) == null
&& row.getCell(3) == null && row.getCell(4) == null && row.getCell(5) == null && row.getCell(6) == null) ||
(
(row.getCell(0) != null && row.getCell(1) != null && row.getCell(2) != null
&& row.getCell(3) != null && row.getCell(4) != null && row.getCell(5) != null && row.getCell(6) != null) &&
("".equals(row.getCell(0).getStringCellValue())
&& "".equals(row.getCell(1).getStringCellValue())
&& "".equals(row.getCell(2).getStringCellValue())
&& "".equals(row.getCell(3).getStringCellValue())
&& "".equals(row.getCell(4).getStringCellValue())
&& "".equals(row.getCell(5).getStringCellValue())
&& "".equals(row.getCell(6).getStringCellValue()))
)) {
return true;
}
return false;
}
} }

11
api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.auth.UpdateUserflagBean; import com.glxp.sale.admin.entity.auth.UpdateUserflagBean;
import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -12,12 +13,14 @@ public interface AuthAdminDao {
/** /**
* 后台业务查询列表 * 后台业务查询列表
*
* @return 列表 * @return 列表
*/ */
List<AuthAdmin> listAdminPage(AuthAdminQueryRequest authAdminQueryRequest); List<AuthAdmin> listAdminPage(AuthAdminQueryRequest authAdminQueryRequest);
/** /**
* 根据id查询 * 根据id查询
*
* @param id 传入的id * @param id 传入的id
* @return * @return
*/ */
@ -25,6 +28,7 @@ public interface AuthAdminDao {
/** /**
* 根据id查询 password * 根据id查询 password
*
* @param id 传入的id * @param id 传入的id
* @return * @return
*/ */
@ -32,13 +36,18 @@ public interface AuthAdminDao {
/** /**
* 根据Name * 根据Name
*
* @param userName 用户名 * @param userName 用户名
* @return * @return
*/ */
AuthAdmin findByUserName(String userName); AuthAdmin findByUserName(String userName);
AuthAdmin findByUser(@Param("userName") String userName,@Param("CustomerId") String CustomerId);
/** /**
* 插入 * 插入
*
* @param authAdmin * @param authAdmin
* @return * @return
*/ */
@ -46,6 +55,7 @@ public interface AuthAdminDao {
/** /**
* 更新 * 更新
*
* @param authAdmin * @param authAdmin
* @return * @return
*/ */
@ -53,6 +63,7 @@ public interface AuthAdminDao {
/** /**
* 删除 * 删除
*
* @param id * @param id
* @return * @return
*/ */

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

@ -20,5 +20,7 @@ public interface BussinessLocalTypeDao {
boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity); boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity);
boolean insertBussinessType(BussinessLocalTypeEntity bussinessTypeEntity);
boolean deleteById(@Param("id") String id); boolean deleteById(@Param("id") String id);
} }

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

@ -55,6 +55,14 @@ public class ErpOrderEntity {
private String status; private String status;
private Integer count; private Integer count;
private Integer bindStatus; private Integer bindStatus;
public Integer getBindStatus() {
if (bindStatus == null)
return 0;
return bindStatus;
}
private String bindRlFk; private String bindRlFk;

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

@ -21,6 +21,7 @@ public class OrderEntity {
private Integer signStatus; private Integer signStatus;
private String stockCheckFk; private String stockCheckFk;
private String remark; private String remark;
private int receiveStatus;
private String customerId; private String customerId;
} }

4
api-admin/src/main/java/com/glxp/sale/admin/httpclient/ErpOrderClient.java
Unescape Escape View File

@ -96,8 +96,8 @@ public class ErpOrderClient {
erpOrderEntity.setBatchNo(subPurchase.getBatchNo()); erpOrderEntity.setBatchNo(subPurchase.getBatchNo());
erpOrderEntity.setProductDate(subPurchase.getProductDate()); erpOrderEntity.setProductDate(subPurchase.getProductDate());
erpOrderEntity.setExpireDate(subPurchase.getExpireDate()); erpOrderEntity.setExpireDate(subPurchase.getExpireDate());
erpOrderEntity.setErpCount(Math.abs(subPurchase.getCount())); erpOrderEntity.setErpCount(Math.abs(Integer.parseInt(subPurchase.getCount())));
erpOrderEntity.setReCount(Math.abs(subPurchase.getReCount())); erpOrderEntity.setReCount(Math.abs(Integer.parseInt(subPurchase.getReCount())));
erpOrderEntity.setGoodsunit(subPurchase.getSpec()); erpOrderEntity.setGoodsunit(subPurchase.getSpec());
erpOrderEntities.add(erpOrderEntity); erpOrderEntities.add(erpOrderEntity);
} }

2
api-admin/src/main/java/com/glxp/sale/admin/req/auth/LoginRequest.java
Unescape Escape View File

@ -16,4 +16,6 @@ public class LoginRequest {
@NotEmpty(message = "密码不能为空") @NotEmpty(message = "密码不能为空")
private String password; private String password;
private Integer type;
} }

2
api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java
Unescape Escape View File

@ -19,7 +19,7 @@ public class OrderFilterRequest extends ListPageRequest {
private String startTime; private String startTime;
private String endTime; private String endTime;
private String stockCheckFk; private String stockCheckFk;
private Integer receiveStatus;
private Integer statusOrOne; private Integer statusOrOne;
private String customerId; private String customerId;
} }

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

@ -7,5 +7,6 @@ public class UpdateExportStatusRequest {
private String orderId; private String orderId;
private Integer exportStatus; private Integer exportStatus;
private Integer checkStatus;
} }

9
api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -48,8 +48,15 @@ public class UdiRelevanceResponse {
private Boolean isDisable; private Boolean isDisable;
private String erpId; private String erpId;
private String erpName; private String erpName;
private Integer productType;
private Boolean isSelect; private Boolean isSelect;
private Boolean isLock; private Boolean isLock;
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
return 1;
} else
return bhzxxsbzsl;
}
} }

12
api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java
Unescape Escape View File

@ -111,8 +111,8 @@ public class ErpOrderResponse {
private String batchNo; private String batchNo;
private String expireDate; private String expireDate;
private String productDate; private String productDate;
private int count; //账面数量 private String count; //账面数量
private int reCount; //实际数量 private String reCount; //实际数量
private String sweepCount; private String sweepCount;
private String ylqxzcrbarmc; private String ylqxzcrbarmc;
private String zczbhhzbapzbh; private String zczbhhzbapzbh;
@ -165,19 +165,19 @@ public class ErpOrderResponse {
this.productDate = productDate; this.productDate = productDate;
} }
public int getCount() { public String getCount() {
return count; return count;
} }
public void setCount(int count) { public void setCount(String count) {
this.count = count; this.count = count;
} }
public int getReCount() { public String getReCount() {
return reCount; return reCount;
} }
public void setReCount(int reCount) { public void setReCount(String reCount) {
this.reCount = reCount; this.reCount = reCount;
} }

1
api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java
Unescape Escape View File

@ -13,6 +13,7 @@ public interface AuthAdminService {
AuthAdmin findByUserName(String userName); AuthAdmin findByUserName(String userName);
AuthAdmin findByUser(String userName, String CustomerId);
AuthAdmin findById(Long id); AuthAdmin findById(Long id);

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

@ -36,8 +36,14 @@ public class AuthAdminServiceImpl implements AuthAdminService {
return authAdminDao.findByUserName(userName); return authAdminDao.findByUserName(userName);
} }
@Override
public AuthAdmin findByUser(String userName, String CustomerId) {
return authAdminDao.findByUser(userName, CustomerId);
}
/** /**
* 根据id 获取需要的info * 根据id 获取需要的info
*
* @param id * @param id
* @return * @return
*/ */
@ -48,6 +54,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
/** /**
* 根据 id 获取密码字段 * 根据 id 获取密码字段
*
* @param id * @param id
* @return * @return
*/ */
@ -58,6 +65,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
/** /**
* 新增 * 新增
*
* @param authAdmin * @param authAdmin
* @return * @return
*/ */
@ -76,6 +84,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
/** /**
* 更新 * 更新
*
* @param authAdmin * @param authAdmin
* @return * @return
*/ */
@ -99,6 +108,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
/** /**
* 根据id删除 * 根据id删除
*
* @param id * @param id
* @return * @return
*/ */

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

@ -17,6 +17,8 @@ public interface BussinessLocalTypeService {
BussinessLocalTypeEntity findBTByName(String name); BussinessLocalTypeEntity findBTByName(String name);
boolean insertBussinessType(BussinessLocalTypeEntity bussinessLocalTypeEntity);
boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity); boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity);
boolean deleteById(String id); boolean deleteById(String id);

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

@ -13,6 +13,8 @@ public interface UdiRelevanceService {
List<UdiRelevanceEntity> filterUdiEntity(FilterUdiInfoRequest filterUdiInfoRequest); List<UdiRelevanceEntity> filterUdiEntity(FilterUdiInfoRequest filterUdiInfoRequest);
UdiRelevanceResponse selectByNameCode(String nameCode);
boolean isExit(); boolean isExit();
List<UdiRelevanceResponse> filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest); List<UdiRelevanceResponse> filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest);

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

@ -65,6 +65,11 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
return null; return null;
} }
@Override
public boolean insertBussinessType(BussinessLocalTypeEntity bussinessLocalTypeEntity) {
return bussinessLocalTypeDao.insertBussinessType(bussinessLocalTypeEntity);
}
@Override @Override
public boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity) { public boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity) {
return bussinessLocalTypeDao.updateBusLocalType(bussinessTypeEntity); return bussinessLocalTypeDao.updateBusLocalType(bussinessTypeEntity);

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

@ -42,6 +42,16 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
return data; return data;
} }
@Override
public UdiRelevanceResponse selectByNameCode(String nameCode) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(nameCode);
List<UdiRelevanceResponse> udiRelevanceResponses = filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0)
return udiRelevanceResponses.get(0);
return null;
}
@Override @Override
public boolean isExit() { public boolean isExit() {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();

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

@ -30,6 +30,9 @@ public interface StockOrderService {
StockOrderEntity findOne(StockOrderFilterRequest stockOrderFilterRequest); StockOrderEntity findOne(StockOrderFilterRequest stockOrderFilterRequest);
StockOrderEntity findById(String orderId); StockOrderEntity findById(String orderId);
StockOrderEntity findByBillNo(String orderId);
List<StockOrderPrintEntity> listOrderPrint(String orderId); List<StockOrderPrintEntity> listOrderPrint(String orderId);
} }

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

@ -94,6 +94,14 @@ public class StockOrderServiceImpl implements StockOrderService {
return stockOrderDao.findOne(stockOrderFilterRequest); return stockOrderDao.findOne(stockOrderFilterRequest);
} }
@Override
public StockOrderEntity findByBillNo(String orderId) {
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
stockOrderFilterRequest.setBillNo(orderId);
return stockOrderDao.findOne(stockOrderFilterRequest);
}
@Override @Override
public List<StockOrderPrintEntity> listOrderPrint(String orderId) { public List<StockOrderPrintEntity> listOrderPrint(String orderId) {
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();

17
api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java
Unescape Escape View File

@ -95,8 +95,21 @@ public class ThrDataService {
if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
for (StockOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { for (StockOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ErpOrderEntity erpOrderResponse = new ErpOrderEntity(); ErpOrderEntity erpOrderResponse = new ErpOrderEntity();
BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); erpOrderResponse.setCredate(thrOrderEntity.getBilldate());
BeanUtils.copyProperties(thrOrderDetailEntity, erpOrderResponse); erpOrderResponse.setCompanyid(thrOrderEntity.getCorpId());
erpOrderResponse.setCompanyname(thrOrderEntity.getCorpName());
erpOrderResponse.setCoName(thrOrderDetailEntity.getProductName());
erpOrderResponse.setGoodsname(thrOrderDetailEntity.getProductName());
erpOrderResponse.setGoodsid(thrOrderDetailEntity.getProductId());
erpOrderResponse.setBatchNo(thrOrderDetailEntity.getBatchNo());
erpOrderResponse.setProductDate(thrOrderDetailEntity.getProductDate());
erpOrderResponse.setExpireDate(thrOrderDetailEntity.getExpireDate());
erpOrderResponse.setReCount(Integer.parseInt(thrOrderDetailEntity.getReCount()));
erpOrderResponse.setErpCount(Integer.parseInt(thrOrderDetailEntity.getCount()));
erpOrderResponse.setAuthCode(thrOrderDetailEntity.getZczbhhzbapzbh());
erpOrderResponse.setProductCompany(thrOrderDetailEntity.getYlqxzcrbarmc());
erpOrderResponse.setPackSpec(thrOrderDetailEntity.getSpec());
erpOrderResponse.setGoodsunit(thrOrderDetailEntity.getSpec());
erpOrderEntities.add(erpOrderResponse); erpOrderEntities.add(erpOrderResponse);
} }
} }

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

@ -1,6 +1,7 @@
package com.glxp.sale.admin.thread; package com.glxp.sale.admin.thread;
import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.constant.BasicProcessStatus;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.constant.UdiInfoImportStatus; import com.glxp.sale.admin.constant.UdiInfoImportStatus;
import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.basic.*;
import com.glxp.sale.admin.req.basic.*; import com.glxp.sale.admin.req.basic.*;
@ -253,7 +254,10 @@ public class BasicGenExcelService {
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
List<String> rows = new ArrayList<>(); List<String> rows = new ArrayList<>();
rows.add(udiRelevanceResponse.getNameCode()); if (udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD)
rows.add(null);
else
rows.add(udiRelevanceResponse.getNameCode());
rows.add(udiRelevanceResponse.getYbbm()); rows.add(udiRelevanceResponse.getYbbm());
rows.add(udiRelevanceResponse.getSptm()); rows.add(udiRelevanceResponse.getSptm());
rows.add(udiRelevanceResponse.getThirdId()); rows.add(udiRelevanceResponse.getThirdId());

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

@ -65,20 +65,7 @@ public class InvProductsTrService {
String nameCode = erpOrderEntity.getNameCode(); String nameCode = erpOrderEntity.getNameCode();
String erpId = erpOrderEntity.getGoodsid(); String erpId = erpOrderEntity.getGoodsid();
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(nameCode); filterUdiInfoRequest.setId(erpId);
if (bussinessTypeEntity.getThirdSysFk().equals("thirdId")) {
filterUdiInfoRequest.setThirdId(erpId);
} else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId1")) {
filterUdiInfoRequest.setThirdId1(erpId);
} else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId2")) {
filterUdiInfoRequest.setThirdId2(erpId);
} else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId3")) {
filterUdiInfoRequest.setThirdId3(erpId);
} else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId4")) {
filterUdiInfoRequest.setThirdId4(erpId);
}
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
String relId = null; String relId = null;
if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {

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

@ -222,15 +222,21 @@ public class IoTransInoutService {
WarehouseQueryRequest tempQuery = new WarehouseQueryRequest(); WarehouseQueryRequest tempQuery = new WarehouseQueryRequest();
tempQuery.setOrderId(orderEntity.getId()); tempQuery.setOrderId(orderEntity.getId());
List<WarehouseEntity> temps = codesTempService.findByOrderId(tempQuery); List<WarehouseEntity> temps = codesTempService.findByOrderId(tempQuery);
if (orderEntity.getErpFk() != null && !"".equals(orderEntity.getErpFk())) {
orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); //todo 改成等待校验，选择校验
} else { genOrderDetail(insertList);
//因为只需用到条码，所以不需要重新读取 // new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList);
new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList); orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK);
orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS); checkMutiDi(orderEntity.getId());
invProductsTrService.genInvProducts(orderEntity.getId()); // if (orderEntity.getErpFk() != null && !"".equals(orderEntity.getErpFk())) {
printOrder(orderEntity.getId()); // orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK);
} // } else {
// //因为只需用到条码，所以不需要重新读取
// new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList);
// orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS);
// invProductsTrService.genInvProducts(orderEntity.getId());
// printOrder(orderEntity.getId());
// }
List<Long> ids = new ArrayList<>(); List<Long> ids = new ArrayList<>();
for (WarehouseEntity w : temps) { for (WarehouseEntity w : temps) {
@ -241,6 +247,35 @@ public class IoTransInoutService {
} }
} }
public void genOrderDetail(List<WarehouseEntity> warehouseEntityList) {
new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, warehouseEntityList);
}
public void checkMutiDi(String orderId) {
//校验是否di绑定多个产品ID
OrderEntity orderEntity = orderService.findById(orderId);
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderId);
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(erpOrderEntity.getNameCode());
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && erpOrderEntity.getBindRlFk() == null) {
erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
myErpOrderService.updateErpOrder(erpOrderEntity);
orderEntity.setRemark("该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID");
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
orderService.updateOrder(orderEntity);
}
}
}
}
//校验ERP单 //校验ERP单
@Async @Async
public void checkOrder() { public void checkOrder() {
@ -280,6 +315,8 @@ public class IoTransInoutService {
printOrder(orderEntity.getId()); printOrder(orderEntity.getId());
invProductsTrService.genInvProducts(orderEntity.getId()); invProductsTrService.genInvProducts(orderEntity.getId());
} }
} }
public void checkThirdOrder(List<ErpOrderEntity> cloudErps, OrderEntity orderEntity, List<WarehouseEntity> transData) { public void checkThirdOrder(List<ErpOrderEntity> cloudErps, OrderEntity orderEntity, List<WarehouseEntity> transData) {

4
api-admin/src/main/resources/application-pro.properties
Unescape Escape View File

@ -6,8 +6,8 @@ spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/
spring.datasource.username=root spring.datasource.username=root
#spring.datasource.password=root #spring.datasource.password=root
spring.datasource.password=123456 spring.datasource.password=123456
server.servlet.context-path= #server.servlet.context-path=
logging.level.com.glxp.sale.admin.dao=debug #logging.level.com.glxp.sale.admin.dao=debug
# \u8DE8\u57DF\u8BBE\u7F6E # \u8DE8\u57DF\u8BBE\u7F6E
cors.allowed-origins=* cors.allowed-origins=*
cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN

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

@ -3,7 +3,8 @@
<mapper namespace="com.glxp.sale.admin.dao.auth.AuthAdminDao"> <mapper namespace="com.glxp.sale.admin.dao.auth.AuthAdminDao">
<select id="listAdminPage" parameterType="com.glxp.sale.admin.req.auth.AuthAdminQueryRequest" resultType="com.glxp.sale.admin.entity.auth.AuthAdmin"> <select id="listAdminPage" parameterType="com.glxp.sale.admin.req.auth.AuthAdminQueryRequest"
resultType="com.glxp.sale.admin.entity.auth.AuthAdmin">
SELECT * SELECT *
FROM auth_user FROM auth_user
<where> <where>
@ -21,7 +22,7 @@
</if> </if>
<if test="CustomerId != null"> <if test="CustomerId != null">
AND CustomerId = #{CustomerId} AND CustomerId = #{CustomerId}
</if> </if>
</where> </where>
ORDER BY id ORDER BY id
@ -34,6 +35,21 @@
<where> <where>
userName = #{userName} userName = #{userName}
</where> </where>
LIMIT 1
</select>
<select id="findByUser" parameterType="Map" resultType="com.glxp.sale.admin.entity.auth.AuthAdmin">
SELECT *
FROM auth_user
<where>
userName = #{userName}
<if test="CustomerId != null">
AND CustomerId = #{CustomerId}
</if>
</where>
LIMIT 1 LIMIT 1
</select> </select>
@ -105,7 +121,9 @@
</update> </update>
<delete id="deleteById" parameterType="java.lang.Long"> <delete id="deleteById" parameterType="java.lang.Long">
delete from auth_user where id = #{id} delete
from auth_user
where id = #{id}
</delete> </delete>
</mapper> </mapper>

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

@ -54,7 +54,7 @@
#{action}, #{action},
#{name}, #{name},
#{enable}, #{enable},
#{remark}, #{remark}
) )
</insert> </insert>

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

@ -19,7 +19,7 @@
basic_products.cpmctymc,basic_products.cplb, basic_products.cpmctymc,basic_products.cplb,
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm, basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,basic_products.productType
FROM basic_udirel FROM basic_udirel
inner JOIN basic_products inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
@ -78,16 +78,16 @@
AND nameCode LIKE concat(#{nameCode},'%') AND nameCode LIKE concat(#{nameCode},'%')
</if> </if>
<if test="unionCode != '' and unionCode != null"> <if test="unionCode != '' and unionCode != null">
or nameCode LIKE concat('%',#{unionCode},'%') or nameCode LIKE concat('%',#{unionCode},'%')
or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%') or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%')
or basic_udirel.sptm LIKE concat('%',#{unionCode},'%') or basic_udirel.sptm LIKE concat('%',#{unionCode},'%')
</if> </if>
<if test="thrPiId != '' and thrPiId != null"> <if test="thrPiId != '' and thrPiId != null">
or thirdId LIKE concat('%',#{thrPiId},'%') or thirdId LIKE concat('%',#{thrPiId},'%')
or thirdId1 LIKE concat('%',#{thrPiId},'%') or thirdId1 LIKE concat('%',#{thrPiId},'%')
or thirdId2 LIKE concat('%',#{thrPiId},'%') or thirdId2 LIKE concat('%',#{thrPiId},'%')
or thirdId3 LIKE concat('%',#{thrPiId},'%') or thirdId3 LIKE concat('%',#{thrPiId},'%')
or thirdId4 LIKE concat('%',#{thrPiId},'%') or thirdId4 LIKE concat('%',#{thrPiId},'%')
</if> </if>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND uuid = #{uuid} AND uuid = #{uuid}
@ -103,33 +103,33 @@
</if> </if>
<if test="filterType != null and filterType == 1"> <if test="filterType != null and filterType == 1">
AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '' ) thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '' )
and basic_products.flbm <![CDATA[<>]]> '' and basic_products.flbm <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 2"> <if test="filterType != null and filterType == 2">
AND basic_products.flbm is NULL AND basic_products.flbm is NULL
</if> </if>
<if test="filterType != null and filterType == 3"> <if test="filterType != null and filterType == 3">
AND thirdId is NULL and basic_products.flbm <![CDATA[<>]]> '' AND thirdId is NULL and basic_products.flbm <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 4"> <if test="filterType != null and filterType == 4">
AND thirdId1 is NULL and basic_products.flbm <![CDATA[<>]]> '' AND thirdId1 is NULL and basic_products.flbm <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 5"> <if test="filterType != null and filterType == 5">
AND thirdId2 is NULL and basic_products.flbm <![CDATA[<>]]> '' AND thirdId2 is NULL and basic_products.flbm <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 6"> <if test="filterType != null and filterType == 6">
AND thirdId3 is NULL and basic_products.flbm <![CDATA[<>]]> '' AND thirdId3 is NULL and basic_products.flbm <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 7"> <if test="filterType != null and filterType == 7">
AND thirdId4 is NULL and basic_products.flbm <![CDATA[<>]]> '' AND thirdId4 is NULL and basic_products.flbm <![CDATA[<>]]> ''
</if> </if>
</where> </where>
ORDER BY updateTime DESC ORDER BY updateTime DESC
</select> </select>
<!-- GROUP BY <!-- GROUP BY
uuid,basic_udirel.thirdId,basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4--> uuid,basic_udirel.thirdId,basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4-->
<select id="selectByUuid" parameterType="java.lang.String" <select id="selectByUuid" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel select * FROM basic_udirel
@ -143,7 +143,9 @@
<select id="selectById" parameterType="java.lang.String" <select id="selectById" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel WHERE id = #{id} select *
FROM basic_udirel
WHERE id = #{id}
</select> </select>
<select id="selectByThirdId" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest" <select id="selectByThirdId" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
@ -196,28 +198,43 @@
</select> </select>
<insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity"> <insert id="insertUdiRelevance" keyProperty="id"
replace INTO basic_udirel parameterType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
replace
INTO basic_udirel
( (
thirdId,thirdName,uuid,isUseDy,updateTime, thirdId,thirdName,uuid,isUseDy,updateTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
) )
values values
( (
#{thirdId}, #{thirdId},
#{thirdName}, #{thirdName},
#{uuid}, #{uuid},
#{isUseDy}, #{isUseDy},
#{updateTime}, #{updateTime},
#{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4}, #{thirdId1},
#{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, #{thirdId2},
#{manufactory}, #{measname},#{ybbm},#{sptm},#{isDisable},#{isLock} #{thirdId3},
) #{thirdId4},
#{thirdName1},
#{thirdName2},
#{thirdName3},
#{thirdName4},
#{manufactory},
#{measname},
#{ybbm},
#{sptm},
#{isDisable},
#{isLock}
)
</insert> </insert>
<delete id="deleteById" parameterType="Map"> <delete id="deleteById" parameterType="Map">
DELETE FROM basic_udirel WHERE id = #{id} DELETE
FROM basic_udirel
WHERE id = #{id}
</delete> </delete>
<delete id="deleteByIds" parameterType="java.util.List"> <delete id="deleteByIds" parameterType="java.util.List">
DELETE FROM basic_udirel WHERE id in DELETE FROM basic_udirel WHERE id in
@ -226,7 +243,9 @@
</foreach> </foreach>
</delete> </delete>
<delete id="deleteByUuid" parameterType="Map"> <delete id="deleteByUuid" parameterType="Map">
DELETE FROM basic_udirel WHERE uuid = #{uuid} DELETE
FROM basic_udirel
WHERE uuid = #{uuid}
</delete> </delete>
<update id="updateUdiRelevance" parameterType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity"> <update id="updateUdiRelevance" parameterType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">

4
api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml
Unescape Escape View File

@ -36,9 +36,9 @@
basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,
basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType
FROM (company_product_relevance FROM company_product_relevance
inner JOIN basic_udirel inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id) ON company_product_relevance.udiRlIdFk = basic_udirel.id
inner JOIN basic_products inner JOIN basic_products
ON basic_udirel.uuid = basic_products.uuid ON basic_udirel.uuid = basic_products.uuid
<where> <where>

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

@ -27,7 +27,9 @@
<if test="nameCode != '' and nameCode!=null"> <if test="nameCode != '' and nameCode!=null">
and nameCode =#{nameCode} and nameCode =#{nameCode}
</if> </if>
<if test="orderId != '' and orderId!=null">
and orderId =#{orderId}
</if>
</where> </where>
ORDER BY actDate ORDER BY actDate
</select> </select>

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

@ -31,7 +31,8 @@
<insert id="insertOrder" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.OrderEntity"> <insert id="insertOrder" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.OrderEntity">
insert INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction, insert INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction,
fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, erpFk, stockCheckFk, customerId) fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
receiveStatus,erpFk, stockCheckFk, customerId)
values (#{id}, values (#{id},
#{action}, #{action},
#{corpOrderId}, #{corpOrderId},
@ -46,13 +47,14 @@
#{fromType}, #{fromType},
#{contrastStatus}, #{contrastStatus},
#{signStatus}, #{signStatus},
#{receiveStatus},
#{erpFk}, #{erpFk},
#{stockCheckFk}, #{stockCheckFk},
#{customerId}) #{customerId})
</insert> </insert>
<update id="updateOrder" parameterType="com.glxp.sale.admin.entity.inout.OrderEntity"> <update id="updateOrder" parameterType="com.glxp.sale.admin.entity.inout.OrderEntity">
UPDATE io_order UPDATE io_order
<set> <trim prefix="set" suffixOverrides=",">
<if test="action != null">action=#{action},</if> <if test="action != null">action=#{action},</if>
<if test="corpOrderId != null">corpOrderId=#{corpOrderId},</if> <if test="corpOrderId != null">corpOrderId=#{corpOrderId},</if>
<if test="actDate != null">actDate=#{actDate},</if> <if test="actDate != null">actDate=#{actDate},</if>
@ -66,9 +68,10 @@
<if test="fromType != null">fromType=#{fromType},</if> <if test="fromType != null">fromType=#{fromType},</if>
<if test="contrastStatus != null">contrastStatus=#{contrastStatus},</if> <if test="contrastStatus != null">contrastStatus=#{contrastStatus},</if>
<if test="erpFk != null">erpFk=#{erpFk},</if> <if test="erpFk != null">erpFk=#{erpFk},</if>
<if test="signStatus != null">signStatus=#{signStatus}</if> <if test="signStatus != null">signStatus=#{signStatus},</if>
<if test="stockCheckFk != null">stockCheckFk=#{stockCheckFk}</if> <if test="receiveStatus != null">receiveStatus=#{receiveStatus},</if>
</set> <if test="stockCheckFk != null">stockCheckFk=#{stockCheckFk},</if>
</trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<select id="listOrderByIds" resultType="com.glxp.sale.admin.entity.inout.OrderEntity"> <select id="listOrderByIds" resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
@ -151,6 +154,10 @@
<if test="unionCtrStatus != '' and unionCtrStatus!=null"> <if test="unionCtrStatus != '' and unionCtrStatus!=null">
and (contrastStatus = 0 or contrastStatus = 2) and (contrastStatus = 0 or contrastStatus = 2)
</if> </if>
<if test="receiveStatus != '' and receiveStatus!=null">
and receiveStatus = #{receiveStatus}
</if>
<if test="signStatus != '' and signStatus!=null"> <if test="signStatus != '' and signStatus!=null">
and signStatus = #{signStatus} and signStatus = #{signStatus}
</if> </if>
@ -209,6 +216,9 @@
<if test="stockCheckFk != '' and stockCheckFk!=null"> <if test="stockCheckFk != '' and stockCheckFk!=null">
and stockCheckFk = #{stockCheckFk} and stockCheckFk = #{stockCheckFk}
</if> </if>
<if test="receiveStatus != '' and receiveStatus!=null">
and receiveStatus = #{receiveStatus}
</if>
<if test="startTime!=null and startTime!=''"> <if test="startTime!=null and startTime!=''">
<![CDATA[ and DATE_FORMAT(actDate, '%Y-%m-%d')>= DATE_FORMAT(#{startTime}, '%Y-%m-%d') ]]> <![CDATA[ and DATE_FORMAT(actDate, '%Y-%m-%d')>= DATE_FORMAT(#{startTime}, '%Y-%m-%d') ]]>
</if> </if>
@ -255,6 +265,9 @@
<if test="stockCheckFk != '' and stockCheckFk!=null"> <if test="stockCheckFk != '' and stockCheckFk!=null">
and stockCheckFk = #{stockCheckFk} and stockCheckFk = #{stockCheckFk}
</if> </if>
<if test="receiveStatus != '' and receiveStatus!=null">
and receiveStatus = #{receiveStatus}
</if>
<if test="startTime!=null and startTime!=''"> <if test="startTime!=null and startTime!=''">
<![CDATA[ and DATE_FORMAT(actDate, '%Y-%m-%d')>= DATE_FORMAT(#{startTime}, '%Y-%m-%d') ]]> <![CDATA[ and DATE_FORMAT(actDate, '%Y-%m-%d')>= DATE_FORMAT(#{startTime}, '%Y-%m-%d') ]]>
</if> </if>

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

@ -173,6 +173,7 @@
<if test="bindRlFk != null">bindRlFk=#{bindRlFk},</if> <if test="bindRlFk != null">bindRlFk=#{bindRlFk},</if>
<if test="count != null">count=#{count},</if> <if test="count != null">count=#{count},</if>
<if test="reCount != null">reCount=#{reCount},</if> <if test="reCount != null">reCount=#{reCount},</if>
<if test="erpCount != null">erpCount=#{erpCount},</if>
<if test="uuidFk != null">uuidFk=#{uuidFk},</if> <if test="uuidFk != null">uuidFk=#{uuidFk},</if>
</trim> </trim>

Write Preview
Loading…
Cancel
Save