修改

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -8,6 +8,7 @@ import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.util.*;
+import com.steerinfo.framework.utils.base.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -602,7 +603,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         String isSelfMention = (String) mapValue.get("isSelfMention");
         // 备注
         String saleRemark = (String) mapValue.get("saleRemark");
-
+        String saleGroupCode = null;
+        try {
+            saleGroupCode = "钢" + StringUtils.substringBetween(saleRemark,"钢","组") + "组";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         // 收款客户
         String saleOrderReceiveCustomer = (String) mapValue.get("saleOrderReceiveCustomer");
         // 业务员
@@ -825,6 +831,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             } catch (Exception e) {
                 e.printStackTrace();
             }
+            if(saleGroupCode != null) {
+                amsSaleMaterial.setTransferOutOfWarehouse(saleGroupCode);
+            }
             amsSaleMaterial.setInsertTime(new Date());
             amsSaleMaterial.setUpdateTime(new Date());
             amsSaleMaterial.setIsPoundSale(isPoundSale);

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -4640,7 +4640,8 @@
 
     <update id="updateAMSDeleted">
     update AMS_SALE_MATERIAL ASM
-    set ASM.DELETED = 0
+    set ASM.DELETED = 0,
+        ASM.INSERT_UPDATE_REMARK = '继续装关闭分录'
     where ASM.SALE_MATERIAL_ID=#{closeWlEntryId}
   </update>
   <update id="updateOldSaleOrderUpload" parameterType="java.math.BigDecimal">