常熟吴彦祖 3 months ago
parent
commit
f33aa412b3
  1. 27
      src/main/java/com/letian/modules/pda/controller/OutBoundController.java
  2. 8
      src/main/java/com/letian/modules/pda/dao/OutBoundDao.java
  3. 15
      src/main/java/com/letian/modules/pda/dao/impl/OutBoundDaoImpl.java
  4. 12
      src/main/java/com/letian/modules/pda/service/OutBoundService.java
  5. 390
      src/main/java/com/letian/modules/pda/service/impl/OutBoundServiceImpl.java

27
src/main/java/com/letian/modules/pda/controller/OutBoundController.java

@ -233,12 +233,37 @@ public class OutBoundController {
public Object outBoundOperation(@RequestBody NotifyInData inData, HttpSession session) {
ResponseData responseData = new ResponseData();
try {
responseData = outBoundService.outBoundOperation(inData, session);
// responseData = outBoundService.outBoundOperation(inData, session);
responseData = outBoundService.outBoundOperationNew(inData, session);
} catch (Exception e) {
responseData.setCode("400");
responseData.setMsg(e.getMessage());
}
return responseData;
}
// /**
// *
// * @Title: outBoundOperationNew
// * @Description: 产品出库操作(序列号与无序列号分仓)rqrq
// * @author rqrq
// * @date 2026年8月24日
// * @param inData
// * @param session
// * @return Object
// * @throws
// */
// @PostMapping(value = "/outBoundOperationNew")
// @ResponseBody
// public Object outBoundOperationNew(@RequestBody NotifyInData inData, HttpSession session) {
// ResponseData responseData = new ResponseData();
// try {
// responseData = outBoundService.outBoundOperationNew(inData, session);
// } catch (Exception e) {
// responseData.setCode("400");
// responseData.setMsg(e.getMessage());
// }
// return responseData;
// }
}

8
src/main/java/com/letian/modules/pda/dao/OutBoundDao.java

@ -190,4 +190,12 @@ public interface OutBoundDao {
* @throws
*/
void updateScanQty(NotifySerialOutData inDate);
/**
* 获取物料默认仓库(用于无序列号出库)rqrq
* @param site 工厂
* @param partNo 料号
* @return 默认仓库
*/
String getPartDefaultWarehouse(String site, String partNo);
}

15
src/main/java/com/letian/modules/pda/dao/impl/OutBoundDaoImpl.java

@ -306,4 +306,19 @@ public class OutBoundDaoImpl implements OutBoundDao {
paramMap.put("delNotifyItemNo", inDate.getDelNotifyItemNo());
parameterJdbcTemplate.update(sql.toString(), paramMap);
}
@Override
public String getPartDefaultWarehouse(String site, String partNo) {
StringBuilder sql = new StringBuilder();
Map<String, Object> paramMap = new HashMap<String, Object>();
sql.append("SELECT ISNULL(pt.DefaultWarehouseID, '')");
sql.append(" FROM Part pt WHERE pt.Site = :site AND pt.PartNo = :partNo");
paramMap.put("site", site);
paramMap.put("partNo", partNo);
List<String> rows = parameterJdbcTemplate.queryForList(sql.toString(), paramMap, String.class);
if (rows == null || rows.size() == 0 || rows.get(0) == null) {
return "";
}
return rows.get(0).trim();
}
}

12
src/main/java/com/letian/modules/pda/service/OutBoundService.java

@ -127,4 +127,16 @@ public interface OutBoundService {
*/
ResponseData outBoundOperation(NotifyInData inData, HttpSession session) throws ParseException;
/**
* @Title: outBoundOperationNew
* @Description: 产品出库操作(序列号与无序列号分仓)rqrq
* @author rqrq
* @date 2026年8月24日
* @param inData
* @param session
* @return ResponseData
* @throws ParseException
*/
ResponseData outBoundOperationNew(NotifyInData inData, HttpSession session) throws ParseException;
}

390
src/main/java/com/letian/modules/pda/service/impl/OutBoundServiceImpl.java

@ -624,6 +624,396 @@ public class OutBoundServiceImpl implements OutBoundService {
return responseData;
}
@Override
@Transactional
public ResponseData outBoundOperationNew(NotifyInData inData, HttpSession session) throws ParseException {
ResponseData responseData = new ResponseData();
//公共参数
String site = inData.getSite();
String delNotifyNo = inData.getDelNotifyNo();
String delAddId = inData.getDelAddId();
String customerId = inData.getCustomerId();
String payerCustomerId = inData.getPayerCustomerId();
String waybillNo = inData.getWaybillNo();
String shippingAgent = inData.getShippingAgent();
String userId = inData.getUserId();
String creditFlag = inData.getCreditFlag();
String palletFlag= inData.getPalletFlag();
// 出库前重新校验通知单主表CustomerID,防止前端参数不一致。rqrq
List<NotifyHeaderOutData> notifyHeaders = outBoundDao.getNotifyHeadersByCon(site, delNotifyNo);
if(notifyHeaders.size() != 1){
throw new RuntimeException("通知单号:" + delNotifyNo + "不存在或数据异常,不允许保存!");
}
NotifyHeaderOutData notifyHeader = notifyHeaders.get(0);
String dbCustomerId = notifyHeader.getCustomerId();
if(dbCustomerId == null || "".equals(dbCustomerId.trim())){
throw new RuntimeException("通知单号:" + delNotifyNo + "的CustomerID为空,不允许保存!");
}
if(customerId != null && !"".equals(customerId.trim()) && !dbCustomerId.equals(customerId)){
logger.warn("outBoundOperationNew CustomerID不一致,使用数据库值。site={}, delNotifyNo={}, requestCustomerId={}, dbCustomerId={}",
site, delNotifyNo, customerId, dbCustomerId);
}
customerId = dbCustomerId;
//生成销售订单号
String salesOrderNo = procedureFunctionDao.getCoDeliveryDelNo(site, new Date());
//CoDelHeader生成数据
CoDelHeaderInData coDelHeader = new CoDelHeaderInData();
coDelHeader.setSite(site);
coDelHeader.setDelNo(salesOrderNo);
coDelHeader.setDelDate(new Date());
coDelHeader.setUserId(userId);
coDelHeader.setEnteredDate(new Date());
coDelHeader.setReceiver(userId);
coDelHeader.setDelAddId(delAddId);
coDelHeader.setWaybillNo(waybillNo);
coDelHeader.setShippingAgent(shippingAgent);
coDelHeader.setCustomerId(customerId);
coDelHeader.setPayerCustomerId(payerCustomerId);
coDelHeader.setCreditFlag(creditFlag);
//保存销售发货单主表数据
outBoundDao.saveCoDelHeader(coDelHeader);
//处理销售发货单明细表数据
//各种缓存的数据
//当前发货单行号
int currentSalesItemNo = 1;
//销售单+销售单行号获取
Map<String, Integer> salesItemMap = new HashMap<String, Integer>();
//销售单+销售单行号获取
Map<String, CoDelDetailInData> salesDetailMap = new HashMap<String, CoDelDetailInData>();
//存档订单+行号对应序列号的数据
Map<String, List<String>> salesDetailCacheMap = new HashMap<String, List<String>>();
List<CoDelDetailInData> coDelDetails = new ArrayList<>();
//缓存无序列号料号对应默认仓库,避免重复查询。rqrq
Map<String, String> noSerialWarehouseCache = new HashMap<String, String>();
//获取缓存的数据
List<SerialNoOutData> serialCahes = stockDao.getSerialNos(site, delNotifyNo, userId, "D");
//判断是否有需要的数据处理
if(serialCahes.size() == 0) {
throw new RuntimeException("未检测到序列号,请核实!");
}
//查询是否有栈板
List<PalletListData> getPalletNoListWithSerials=stockDao.getPalletNoListWithSerials(site, delNotifyNo, userId, "D");
//循环设置数据
for(SerialNoOutData serialCahe : serialCahes){
String orderNo = serialCahe.getOrderRef3();
String orderRef4 = serialCahe.getOrderRef4();
float qty = serialCahe.getQty();
if(null == orderRef4 || "".equals(orderRef4)){
orderRef4 = "0";
}
float itemNo = Float.parseFloat(orderRef4);
String tempKey = orderNo+"-"+itemNo;
String orderRef2 = serialCahe.getOrderRef2();
//判断是否为空值
if(orderRef2 == null || "".equalsIgnoreCase(orderRef2)){
orderRef2 = "0";
}
int delNotifyItemNo = Integer.parseInt(orderRef2);
//获取物料编码
String partNo = procedureFunctionDao.GetNotifyDetailPartNo(site, delNotifyNo, delNotifyItemNo);
//判断是否处理过
if(salesDetailMap.containsKey(tempKey)){
CoDelDetailInData tempCoDetail = salesDetailMap.get(tempKey);
//重置参数数量
float shipQty = tempCoDetail.getShipQty() + qty;
float toInvoiceQty = tempCoDetail.getToInvoiceQty() + qty;
float toInvNofityQty = tempCoDetail.getToInvNofityQty() + qty;
tempCoDetail.setShipQty(shipQty);
tempCoDetail.setToInvoiceQty(toInvoiceQty);
tempCoDetail.setToInvNofityQty(toInvNofityQty);
}else{
CoDelDetailInData tempCoDetail = new CoDelDetailInData();
//设置参数
tempCoDetail.setSite(site);
tempCoDetail.setDelNo(salesOrderNo);
tempCoDetail.setDelNoItemNo(currentSalesItemNo);
tempCoDetail.setOrderNo(orderNo);
tempCoDetail.setItemNo(itemNo);;
tempCoDetail.setShipQty(qty);
tempCoDetail.setReserveSeqNo(-1);
tempCoDetail.setToInvNofityQty(qty);
tempCoDetail.setToInvoiceQty(qty);
tempCoDetail.setDelNotifyNo(delNotifyNo);
tempCoDetail.setPartNo(partNo);
tempCoDetail.setDelNotifyItemNo(delNotifyItemNo);
//获取技术注意事项
String techInfo = procedureFunctionDao.GetNotifyDetailTechInfo(site, delNotifyNo, delNotifyItemNo);
tempCoDetail.setTechInfo(techInfo);
//设置当前订单+订单行号对应的发货单行号的序号
salesItemMap.put(tempKey, currentSalesItemNo);
currentSalesItemNo++;
//放入到缓存的发货单明细数据
coDelDetails.add(tempCoDetail);
salesDetailMap.put(tempKey, tempCoDetail);
//填充序列号数据
List<String> serialNos = new ArrayList<>();
salesDetailCacheMap.put(tempKey, serialNos);
}
//处理当前参数对应的Map
List<String> tempCoDelDetails = salesDetailCacheMap.get(tempKey);
tempCoDelDetails.add(serialCahe.getSerialNo());
// 新出库逻辑:有序列号固定FG,无序列号按Part.DefaultWarehouseID(空则MAT-1)。rqrq
String warehouseId = getWarehouseIdForOutBoundNew(site, serialCahe, partNo, noSerialWarehouseCache);
serialCahe.setWareHouseId(warehouseId);
serialCahe.setPartNo(partNo);
}
//处理明细的serialNo数据
for(CoDelDetailInData coDelDetail : coDelDetails){
String tempKey = coDelDetail.getOrderNo()+"-"+coDelDetail.getItemNo();
List<String> serialNos = salesDetailCacheMap.get(tempKey);
String serialResult = "";
if(serialNos.size()>1){
String str=serialNos.get(serialNos.size()-1);
serialResult=serialNos.get(0)+"-"+str.substring(str.length()-4);
}else {
serialResult=serialNos.get(0);
}
coDelDetail.setDisplaySerialNo(serialResult);
coDelDetail.setRemark("");
//判断数量是否是整数
float shipQty = coDelDetail.getShipQty();
int countQty = (int) shipQty;
if(shipQty != countQty) {
throw new RuntimeException("安全钳数量有误!");
}
}
//批量保存发货数据
logger.info(inData.getDelNotifyNo()+"开始保存发货数据");
logger.info(JSON.toJSONString(coDelDetails));
outBoundDao.batchInsertCoDelDetail(coDelDetails);
//统计生成transHeader说数据
//缓存transHeader的TransNo和warehouse的对应的数据
Map<String, String> transNoWarehouseMap = new HashMap<>();
Date transDate = DateUtils.getDateByParten(DateUtils.getStringDate(new Date(), "yyyy-MM-dd"), "yyyy-MM-dd");
//缓存transHeader的数据
List<TransHeaderInData> transHeaders = new ArrayList<>();
String palletNo="";
//栈板操作 0427 rq
for (int i = 0; i <getPalletNoListWithSerials.size() ; i++) {
if("Y".equals(inData.getPalletFlag())){
palletMapper.updatePalletStatus(site, getPalletNoListWithSerials.get(i).getPalletNo(), "空置");
}else {
palletMapper.updatePalletStatus(site, getPalletNoListWithSerials.get(i).getPalletNo(), "已出库");
}
palletMapper.updatePalletLocation(site, getPalletNoListWithSerials.get(i).getPalletNo(),"");
palletMapper.cleanPalletFillData(getPalletNoListWithSerials.get(i));
}
for(SerialNoOutData serialCahe : serialCahes){
String warehouseId = serialCahe.getWareHouseId();
//判断已经时候生成
if(transNoWarehouseMap.containsKey(warehouseId)){
continue;
}else{
//重新生成transHeader
TransHeaderInData transHeader = new TransHeaderInData();
String transNo = procedureFunctionDao.getTransNo(site, "CS");
procedureFunctionDao.updateTransNo(site, "CS");
//缓存transNo
transNoWarehouseMap.put(warehouseId, transNo);
float transYear = procedureFunctionDao.getTransYear(site, new Date());
float transMonth = procedureFunctionDao.getTransMonth(site, new Date());
String partnerName = procedureFunctionDao.getCustomerName(site, customerId);
String authorizeFlag = procedureFunctionDao.getTransAuthorizeFlag(site, "CS");
String transFlag = procedureFunctionDao.getTransFlag(site, "CS");
transHeader.setSite(site);
transHeader.setTransNo(transNo);
transHeader.setWarehouse(warehouseId);
transHeader.setTransDate(transDate);
transHeader.setTransType("销售出库");
transHeader.setTransTypeDb("CS");
transHeader.setUserId(userId);
transHeader.setReceiver(userId);
transHeader.setTransYear(transYear);
transHeader.setTransMonth(transMonth);
transHeader.setPartnerId(customerId);
transHeader.setPartnerName(partnerName);
transHeader.setPartnerType("C");
transHeader.setAuthorizeFlag(authorizeFlag);
transHeader.setTransFlag(transFlag);
transHeader.setEnterDate(new Date());
transHeader.setUseLocation("N");
transHeader.setOrderRef1(salesOrderNo);
transHeader.setLinkOrderFlag("N");
transHeader.setStatus("已录入");
transHeader.setDirectionFlag("-");
transHeader.setWithSerialNoFlag("Y");
transHeader.setPalletNo(palletNo);
transHeaders.add(transHeader);
}
}
//批量保存数据
transDao.batchInsertTransHeaders(transHeaders);
//汇总transDetails
//统计transNo的itemNo
Map<String, Integer> transNoItemMap = new HashMap<>();
//缓存统计仓库+订单号+行号的transDetail
Map<String, TransDetailInData> transDetailsMap = new HashMap<>();
//缓存的信息
List<TransDetailInData> transDetails = new ArrayList<>();
//汇总
for(SerialNoOutData serialCahe : serialCahes){
String warehouseId = serialCahe.getWareHouseId();
String orderNo = serialCahe.getOrderRef3();
String orderRef4 = serialCahe.getOrderRef4();
float qty = serialCahe.getQty();
if(null == orderRef4 || "".equals(orderRef4)){
orderRef4 = "0";
}
float itemNo = Float.parseFloat(orderRef4);
String transDetailsKey = warehouseId+"-"+orderNo+"-"+itemNo;
//判断是否保存过数据
if(transDetailsMap.containsKey(transDetailsKey)){
//重置计算的数量
TransDetailInData transDetail = transDetailsMap.get(transDetailsKey);
BigDecimal transQty = transDetail.getTransQty().add(new BigDecimal(qty));
transDetail.setTransQty(transQty);
transDetail.setAbsTransQty(transQty.negate());
continue;
}else{
//获取transNo
String transNo = transNoWarehouseMap.get(warehouseId);
String partNo = serialCahe.getPartNo();
int transItemNo = 0;
//获取交易号
//判断是否缓存当前的交易号
if(transNoItemMap.containsKey(transNo)){
transItemNo = transNoItemMap.get(transNo) + 1;
transNoItemMap.put(transNo, transItemNo);
}else{
transItemNo = 1;
transNoItemMap.put(transNo, transItemNo);
}
// location按原逻辑保持*。rqrq
String locationNo = "*";
//获取标准成本
BigDecimal standCost = procedureFunctionDao.getStandCost(site, partNo);
//实际成本
BigDecimal actualCost = procedureFunctionDao.getActualCost(site, partNo);
//获取familyId
String familyId = procedureFunctionDao.getFamilyId(site, partNo);
//获取familyName
String familyName = procedureFunctionDao.getFamilyName(site, familyId);
//获取groupId
String groupId = procedureFunctionDao.getGroupId(site, partNo);
//获取groupName
String groupName = procedureFunctionDao.getGroupName(site, groupId);
TransDetailInData transDetail = new TransDetailInData();
transDetail.setSite(site);
transDetail.setBatchNo("*");
transDetail.setTransNo(transNo);
transDetail.setItemNo(transItemNo);
transDetail.setPartNo(serialCahe.getPartNo());
transDetail.setLocation(locationNo);
transDetail.setTransQty(new BigDecimal(qty));
transDetail.setDirection("-");
transDetail.setStandCost(standCost);
transDetail.setActualCost(actualCost);
transDetail.setOrderRef1(orderNo);
transDetail.setOrderRef2(itemNo);
transDetail.setOrderRef3(salesOrderNo);
transDetail.setOrderRef4(salesItemMap.get(orderNo+"-"+itemNo)+"");
transDetail.setAbsTransQty(new BigDecimal(-qty));
transDetail.setFamilyId(familyId);
transDetail.setFamilyName(familyName);
transDetail.setGroupId(groupId);
transDetail.setGroupName(groupName);
transDetails.add(transDetail);
transDetailsMap.put(transDetailsKey, transDetail);
}
}
//批量保存交易的明细数据
transDao.batchInsertTransDetails(transDetails);
//生成卷号参数数据
//缓存卷号参数列表数据
List<TransDetailSubInData> transDetailSubs = new ArrayList<>();
for(SerialNoOutData serialCahe : serialCahes){
String warehouseId = serialCahe.getWareHouseId();
String orderNo = serialCahe.getOrderRef3();
String orderRef4 = serialCahe.getOrderRef4();
if(null == orderRef4 || "".equals(orderRef4)){
orderRef4 = "0";
}
float itemNo = Float.parseFloat(orderRef4);
String transDetailsKey = warehouseId+"-"+orderNo+"-"+itemNo;
TransDetailInData transDetail = transDetailsMap.get(transDetailsKey);
String transNo = transDetail.getTransNo();
float detailItemNo = transDetail.getItemNo();
String coDetailItemNoKey = orderNo+"-"+itemNo;
float coDetailItemNo = salesItemMap.get(coDetailItemNoKey);
TransDetailSubInData transDetailSub = new TransDetailSubInData();
transDetailSub.setSite(site);
transDetailSub.setSerialNo(serialCahe.getSerialNo());
transDetailSub.setTransNo(transNo);
transDetailSub.setItemNo(detailItemNo);
transDetailSub.setDirection("-");
transDetailSub.setOrderRef1(salesOrderNo);
transDetailSub.setOrderRef2(coDetailItemNo);
transDetailSub.setOrderRef3(orderNo);
transDetailSub.setOrderRef4(itemNo);
transDetailSub.setUserId(userId);
transDetailSub.setOrderTypeRef("销售出库");
transDetailSub.setOrderTypeRefDb("D");
transDetailSub.setUserId(userId);
transDetailSubs.add(transDetailSub);
}
//批量保存数据
transDao.batchInsertTransDetailSubs(transDetailSubs);
//批量修改salesPartSerialNoList的数据
outBoundDao.batchUpdateSalesPartSerialNoList(transDetailSubs, "Y");
//批量修改salesPartSerialNoList的数据
outBoundDao.batchUpdateShopOrderSerialNoList(transDetailSubs, "N", "Y");
//删除缓存的数据
stockDao.delDetailSubCacheByCon(site, delNotifyNo, null, userId, "D");
//删除缓存的数据
session.setAttribute("out_del_notify_no", "");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setCode("200");
return responseData;
}
/**
* 新出库分仓规则:有序列号固定FG,无序列号用Part默认仓库(空则MAT-1)。rqrq
*/
private String getWarehouseIdForOutBoundNew(String site, SerialNoOutData serialCache, String partNo,
Map<String, String> noSerialWarehouseCache) {
if (!isNoSerialCacheData(serialCache)) {
return "FG";
}
if (partNo == null || "".equals(partNo.trim())) {
logger.warn("outBoundOperationNew无序列号数据料号为空,回退仓库MAT-1。site={}, serialNo={}",
site, serialCache.getSerialNo());
return "MAT-1";
}
if (noSerialWarehouseCache.containsKey(partNo)) {
return noSerialWarehouseCache.get(partNo);
}
String defaultWarehouse = outBoundDao.getPartDefaultWarehouse(site, partNo);
if (defaultWarehouse == null || "".equals(defaultWarehouse.trim())) {
defaultWarehouse = "MAT-1";
} else {
defaultWarehouse = defaultWarehouse.trim();
}
noSerialWarehouseCache.put(partNo, defaultWarehouse);
return defaultWarehouse;
}
/**
* 缓存记录的UserID为空,认为是无序列号出库缓存数据。rqrq
*/
private boolean isNoSerialCacheData(SerialNoOutData serialCache) {
return serialCache.getUserId() == null || "".equals(serialCache.getUserId().trim());
}
/**
* @Title:
* @Description: 处理序列号显示规则

Loading…
Cancel
Save