日计划排产 日计划查询

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

@@ -380,7 +380,7 @@ public class OutBoundServiceImpl implements OutBoundService {
 		//缓存transHeader的TransNo和warehouse的对应的数据
 		Map<String, String> transNoWarehouseMap = new HashMap<>();
 		//缓存transheader是否参与库位管理
-		Map<String, String> transLocationMap = new HashMap<>();
+		// Map<String, String> transLocationMap = new HashMap<>();
 		//缓存warehouseId的map数据
 		//Map<String, String> warehouseMap = new HashMap<>();
 		Date transDate = DateUtils.getDateByParten(DateUtils.getStringDate(new Date(), "yyyy-MM-dd"), "yyyy-MM-dd");
@@ -417,9 +417,9 @@ public class OutBoundServiceImpl implements OutBoundService {
 				String partnerName = procedureFunctionDao.getCustomerName(site, customerId);
 				String authorizeFlag = procedureFunctionDao.getTransAuthorizeFlag(site, "CS");
 				String transFlag = procedureFunctionDao.getTransFlag(site, "CS");
-				String useLocation = procedureFunctionDao.getWarehouseUseLocation(site, warehouseId);
+				// String useLocation = procedureFunctionDao.getWarehouseUseLocation(site, warehouseId);
 				//缓存是否库位管理
-				transLocationMap.put(transNo, useLocation);
+				// transLocationMap.put(transNo, useLocation);
 				transHeader.setSite(site);
 				transHeader.setTransNo(transNo);
 				transHeader.setWarehouse(warehouseId);
@@ -436,7 +436,7 @@ public class OutBoundServiceImpl implements OutBoundService {
 				transHeader.setAuthorizeFlag(authorizeFlag);
 				transHeader.setTransFlag(transFlag);
 				transHeader.setEnterDate(new Date());
-				transHeader.setUseLocation(useLocation);
+				transHeader.setUseLocation("N");
 				transHeader.setOrderRef1(salesOrderNo);
 				transHeader.setLinkOrderFlag("N");
 				transHeader.setStatus("已录入");
@@ -491,12 +491,12 @@ public class OutBoundServiceImpl implements OutBoundService {
 					transNoItemMap.put(transNo, transItemNo);
 				}
 				//根据获取的库位管理标记判断是否
-				String flag = transLocationMap.get(transNo);
+				// String flag = transLocationMap.get(transNo);
 				String locationNo = "*";
-				if(!"N".equals(flag)) {
-					//获取库位
-					locationNo = outBoundDao.getTransDetailLocation(site, partNo);
-				}
+				// if(!"N".equals(flag)) {
+				// 	//获取库位
+				// 	locationNo = outBoundDao.getTransDetailLocation(site, partNo);
+				// }
 				//获取标准成本
 				BigDecimal standCost = procedureFunctionDao.getStandCost(site, partNo);
 				//实际成本
@@ -515,7 +515,7 @@ public class OutBoundServiceImpl implements OutBoundService {
 				transDetail.setTransNo(transNo);
 				transDetail.setItemNo(transItemNo);
 				transDetail.setPartNo(serialCahe.getPartNo());
-				transDetail.setLocation(locationNo);
+				transDetail.setLocation("*");
 				transDetail.setTransQty(new BigDecimal(qty));
 				transDetail.setDirection("-");
 				transDetail.setStandCost(standCost);

src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java

@@ -232,7 +232,7 @@ public class PalletServiceImpl implements PalletService {
             String site = inList.get(0).getSite();
             String userId = inList.get(0).getUserId();
             // String customerId = inList.get(0).getCustomerId();
-            // String orderNo = inList.get(0).getOrderNo();
+            String orderNo = inList.get(0).getOrderNo();
             String warehouse = inList.get(0).getWarehouse();
             String location = inData.getLocation();
             // String partNo = inList.get(0).getPartNo();
@@ -298,8 +298,9 @@ public class PalletServiceImpl implements PalletService {
             transHeader.setAuthorizeFlag(authorizeFlag);
             transHeader.setTransFlag(transFlag);
             transHeader.setPalletNo(palletNo);
-            transHeader.setUseLocation(useLocation);
+            transHeader.setUseLocation("N");
             transHeader.setShiftid(inData.getShiftid());
+            transHeader.setOrderRef1(orderNo);
             transHeader.setOrderDate(inData.getOrderDate());
             List<TransHeaderInData> transHeaders = new ArrayList<TransHeaderInData>();
             transHeaders.add(transHeader);
@@ -325,7 +326,7 @@ public class PalletServiceImpl implements PalletService {
                 transDetail.setTransNo(transNo);
                 transDetail.setItemNo(i+1);
                 transDetail.setPartNo(qtyList.get(i).getPartNo());
-                transDetail.setLocation(location);
+                transDetail.setLocation("*");
                 transDetail.setTransQty(new BigDecimal(qtyList.get(i).getQty()));
                 transDetail.setDirection("+");
                 transDetail.setBatchNo("*");
@@ -398,8 +399,6 @@ public class PalletServiceImpl implements PalletService {
             //批量更新SalesPartSerialNoList数据
             transDao.batchUpdateSalesPartSerialNoList(detailSubs);
             palletMapper.updatePalletStatusAndLocation(inData.getSite(),inData.getPalletNo(),"已入库",location);
-
-
         }