wms入库批次修改批次

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java

@@ -105,4 +105,6 @@ public interface OdsProcureOrderMapper {
     void deleteBatchPallet(@Param("list")List<OdsProcureOrder> dtos0);
 
     List<OdsProcureOrder> getIdCardListByU1(OdsProcureOrder order);
+
+    String selectOdsProcureOrderUserDefined7New(@Param("formattedTEM")String formattedDate);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -688,10 +688,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             if (orderList.size() > 0) {
                 continue;
             }
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
             Date date = new Date();
             String formattedDate = dateFormat.format(date);
-            order.setUserDefined7(formattedDate+order.getUserDefined3());
+            String  userDefined7=   odsProcureOrderMapper.selectOdsProcureOrderUserDefined7New(formattedDate);
+            order.setUserDefined7(userDefined7);
             order.setPlanNumber(new BigDecimal(sapPurchaseOrderQuery1.get("menge")));
             order.setUnit(sapPurchaseOrderQuery1.get("meins"));
             order.setSupplierCode(sapPurchaseOrderQuery1.get("lifnr"));
@@ -974,10 +975,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 //这个地方判断下是不是采购单已经被插入了，如果是的话，并且是走的送货单的路径，那就把送货单给她附上
                 continue;
             }
-           SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+           SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
             Date date = new Date();
             String formattedDate = dateFormat.format(date);
-            order.setUserDefined7(formattedDate+order.getUserDefined3());
+           String  userDefined7=   odsProcureOrderMapper.selectOdsProcureOrderUserDefined7New(formattedDate);
+          //  order.setUserDefined7(formattedDate+order.getUserDefined3());
+           order.setUserDefined7(userDefined7);
             order.setUserDefined11(sapPurchaseOrderQuery1.get("realDate"));
             order.setPlanNumber(new BigDecimal(sapPurchaseOrderQuery1.get("thisDeliNum")));
             order.setUnit(sapPurchaseOrderQuery1.get("unit"));

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml

@@ -795,5 +795,13 @@
         where  User_Defined1= #{userDefined1}
         ORDER BY  CAST(card_num AS INT)
     </select>
+    <select id="selectOdsProcureOrderUserDefined7New"  resultType="java.lang.String" >
+        SELECT
+            COALESCE(MAX(User_Defined7) + 1,  #{formattedTEM} + '001') AS Next_Value
+        FROM
+            ods_procure_order_copy1
+        WHERE
+            LEFT(User_Defined7, 6) =  #{formattedTEM}
+    </select>
 </mapper>