Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -2115,13 +2115,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         }catch (Exception e){
             e.printStackTrace();
         }
-        // 设置新的运输订单号
-        OmstruckOrder wysdd = new OmstruckOrder();
-        wysdd.setOrderId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
-        wysdd.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", omstruckOrderMapper.selectMaxId().intValue()));
-        omstruckOrderMapper.updateByPrimaryKeySelective(wysdd);
-        //插入日志
-        saleLogUtil.logOrder(wysdd.getOrderId(),"修改车牌号",mapValue,SaleLogUtil.UPDATE);
+        saleLogUtil.logOrder(DataChange.dataToBigDecimal(mapValue.get("orderId")),"修改车牌号",mapValue,SaleLogUtil.UPDATE);
         if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
             String capacityids="";
             Integer capacityid1= (Integer) mapValue.get("capacityIds");
@@ -2181,10 +2175,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     }
                     OmstruckOrder omstruckOrder = new OmstruckOrder();
                     omstruckOrder.setOrderId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
+                    // 设置新的运输订单号
+                    omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", omstruckOrderMapper.selectMaxId().intValue()));
                     omstruckOrder.setOrderStatus(new BigDecimal(4));
                     omstruckOrder.setOrderLineSequence(new BigDecimal(0));
                         /*omstruckOrder.set*/
                     result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+                    //插入日志
                     result += omstruckOrderMapper.deleteEnResult(resultTotalId);
                     result += omstruckOrderMapper.deleteWeightResult(resultTotalId);
                     result += omstruckOrderMapper.deleteLoadResult(resultTotalId);
@@ -2747,6 +2744,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");
         // 业务员
@@ -2922,6 +2925,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             } catch (Exception e) {
                 e.printStackTrace();
             }
+            if(saleGroupCode != null) {
+                amsSaleMaterial.setTransferOutOfWarehouse(saleGroupCode);
+            }
             result += amsSaleMaterialMapper.insertSelective(amsSaleMaterial);
             /*
             车序号物资表