|
|
|
@ -9,8 +9,11 @@ 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.DataTransUtil;
|
|
|
|
|
import com.glxp.sale.admin.entity.auth.AuthAdmin;
|
|
|
|
|
import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.inout.*;
|
|
|
|
|
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.thrsys.ThrOrderEntity;
|
|
|
|
@ -24,12 +27,10 @@ import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse;
|
|
|
|
|
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
|
|
|
|
|
import com.glxp.sale.admin.res.inout.ErpOrderResponse;
|
|
|
|
|
import com.glxp.sale.admin.service.auth.CustomerService;
|
|
|
|
|
import com.glxp.sale.admin.service.basic.BussinessOriginTypeService;
|
|
|
|
|
import com.glxp.sale.admin.service.basic.BussinessTypeService;
|
|
|
|
|
import com.glxp.sale.admin.service.basic.UdiInfoService;
|
|
|
|
|
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
|
|
|
|
|
import com.glxp.sale.admin.service.basic.*;
|
|
|
|
|
import com.glxp.sale.admin.service.info.CompanyService;
|
|
|
|
|
import com.glxp.sale.admin.service.inout.*;
|
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
|
|
|
|
|
import com.glxp.sale.admin.service.param.SystemParamConfigService;
|
|
|
|
|
import com.glxp.sale.admin.service.thrsys.ThrDataService;
|
|
|
|
|
import com.glxp.sale.admin.service.thrsys.ThrOrderDetailService;
|
|
|
|
@ -112,7 +113,7 @@ public class OrderDetailController {
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
|
|
|
|
|
BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest);
|
|
|
|
@ -150,7 +151,6 @@ public class OrderDetailController {
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(erpOrderResponses);
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//手持终端下载业务单据
|
|
|
|
@ -211,6 +211,9 @@ public class OrderDetailController {
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
BasicBusTypeChangeService basicBusTypeChangeService;
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/erpOrder/addStockOrder")
|
|
|
|
|
public BaseResponse addStockOrder(FilterOrderRequest filterErpOrderRequest,
|
|
|
|
@ -219,16 +222,13 @@ public class OrderDetailController {
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String customerId = customerService.getCustomerId() + "";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ThrOrderEntity thrOrderEntity = thrOrderService.findById(String.valueOf(filterErpOrderRequest.getId()));
|
|
|
|
|
if (thrOrderEntity == null) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.DATA_NOT);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
StockOrderEntity temp = stockOrderService.findByBillNo(thrOrderEntity.getBillNo() + "");
|
|
|
|
|
StockOrderEntity temp = stockOrderService.findByBillNo(thrOrderEntity.getBillNo());
|
|
|
|
|
if (temp != null) {
|
|
|
|
|
return ResultVOUtils.error(500, "单据已被选入,请勿重复选入!");
|
|
|
|
|
}
|
|
|
|
@ -237,8 +237,11 @@ public class OrderDetailController {
|
|
|
|
|
BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity);
|
|
|
|
|
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.BUS_ORDER, "yyyyMMdd"));
|
|
|
|
|
stockOrderEntity.setBillNo(billNo);
|
|
|
|
|
|
|
|
|
|
//第三方单据
|
|
|
|
|
BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finByThirdAction(thrOrderEntity.getBillType());
|
|
|
|
|
stockOrderEntity.setBillType(bussinessOriginTypeResponse.getLocalAction());
|
|
|
|
|
|
|
|
|
|
stockOrderEntity.setId(null);
|
|
|
|
|
stockOrderEntity.setCustomerId(customerId);
|
|
|
|
|
stockOrderEntity.setUnitIdFk(customerId);
|
|
|
|
@ -259,8 +262,14 @@ public class OrderDetailController {
|
|
|
|
|
List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
|
|
|
|
|
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
|
|
|
|
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
|
|
|
|
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk());
|
|
|
|
|
|
|
|
|
|
if (udiRelevanceEntity == null) {
|
|
|
|
|
return ResultVOUtils.error(500, "单据里含有未维护的产品信息,选入失败!");
|
|
|
|
|
}
|
|
|
|
|
BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity);
|
|
|
|
|
stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId());
|
|
|
|
|
// stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId());
|
|
|
|
|
stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId());
|
|
|
|
|
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + "");
|
|
|
|
|
stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + "");
|
|
|
|
|
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
|
|
|
|
@ -269,8 +278,85 @@ public class OrderDetailController {
|
|
|
|
|
}
|
|
|
|
|
stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntityList);
|
|
|
|
|
}
|
|
|
|
|
thrOrderEntity.setAllocateStatus(1);
|
|
|
|
|
thrOrderService.updateThrOrder(thrOrderEntity);
|
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
InvWarehouseService invWarehouseService;
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/receive/addStockOrder")
|
|
|
|
|
public BaseResponse addReceiveOrder(FilterOrderRequest filterErpOrderRequest,
|
|
|
|
|
BindingResult bindingResult) {
|
|
|
|
|
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
String customerId = customerService.getCustomerId() + "";
|
|
|
|
|
ThrOrderEntity thrOrderEntity = thrOrderService.findById(String.valueOf(filterErpOrderRequest.getId()));
|
|
|
|
|
if (thrOrderEntity == null) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.DATA_NOT);
|
|
|
|
|
}
|
|
|
|
|
StockOrderEntity temp = stockOrderService.findByBillNo(thrOrderEntity.getBillNo());
|
|
|
|
|
if (temp != null) {
|
|
|
|
|
return ResultVOUtils.error(500, "单据已被选入,请勿重复选入!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
StockOrderEntity stockOrderEntity = new StockOrderEntity();
|
|
|
|
|
BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity);
|
|
|
|
|
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.BUS_ORDER, "yyyyMMdd"));
|
|
|
|
|
stockOrderEntity.setBillNo(billNo);
|
|
|
|
|
|
|
|
|
|
BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.findByAction(thrOrderEntity.getBillType());
|
|
|
|
|
stockOrderEntity.setBillType(basicBusTypeChangeEntity.getTargetBusAction());
|
|
|
|
|
|
|
|
|
|
stockOrderEntity.setId(null);
|
|
|
|
|
stockOrderEntity.setCustomerId(customerId);
|
|
|
|
|
stockOrderEntity.setUnitIdFk(customerId);
|
|
|
|
|
stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交
|
|
|
|
|
stockOrderEntity.setLocStorageCode(thrOrderEntity.getCorpId());
|
|
|
|
|
stockOrderEntity.setInvWarehouseCode(thrOrderEntity.getFromSubInvCode());
|
|
|
|
|
stockOrderEntity.setThirdOrderFk(thrOrderEntity.getBillNo());
|
|
|
|
|
stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交
|
|
|
|
|
stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印
|
|
|
|
|
stockOrderEntity.setFromSubInvCode(thrOrderEntity.getInvWarehouseCode());
|
|
|
|
|
stockOrderEntity.setCorpId(thrOrderEntity.getLocStorageCode());
|
|
|
|
|
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(thrOrderEntity.getLocStorageCode());
|
|
|
|
|
stockOrderEntity.setCorpName(invWarehouseEntity.getName());
|
|
|
|
|
stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
|
|
|
|
|
boolean b = stockOrderService.insertStockOrder(stockOrderEntity);
|
|
|
|
|
stockOrderEntity = stockOrderService.findByBillNo(billNo);
|
|
|
|
|
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
|
|
|
|
|
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
|
|
|
|
|
List<ThrOrderDetailEntity> thrOrderDetailEntities =
|
|
|
|
|
thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
|
|
|
|
|
if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
|
|
|
|
|
List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
|
|
|
|
|
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
|
|
|
|
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
|
|
|
|
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk());
|
|
|
|
|
|
|
|
|
|
if (udiRelevanceEntity == null) {
|
|
|
|
|
return ResultVOUtils.error(500, "单据里含有未维护的产品信息,选入失败!");
|
|
|
|
|
}
|
|
|
|
|
BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity);
|
|
|
|
|
// stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId());
|
|
|
|
|
stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId());
|
|
|
|
|
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + "");
|
|
|
|
|
stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + "");
|
|
|
|
|
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
|
|
|
|
|
stockOrderDetailEntity.setSweepCount(0 + "");
|
|
|
|
|
stockOrderDetailEntityList.add(stockOrderDetailEntity);
|
|
|
|
|
}
|
|
|
|
|
stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntityList);
|
|
|
|
|
}
|
|
|
|
|
thrOrderEntity.setAllocateStatus(1);
|
|
|
|
|
thrOrderService.updateThrOrder(thrOrderEntity);
|
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|