修改

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

@@ -209,6 +209,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             result += amsSaleMaterialMapper.closeAllSaleMaterial(amsSaleOrder.getSaleOrderId());
             result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
             List<Map<String, Object>> warehouseList = amsSaleOrderMapper.getWareHouse(amsSaleOrder.getSaleOrderId());
+            try {
+                saleLogUtil.logSaleOrder(amsSaleOrder.getSaleOrderId(),"金蝶关闭销售订单,物流同步关闭" + insertUpdateRemark,"金蝶" + userName,SaleLogUtil.CLOSE);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             if (warehouseList != null && warehouseList.size() != 0 && warehouseList.get(0) != null) {
                 Object warehouse = warehouseList.get(0).get("warehouse");
                 if (warehouse != null && "副产品库".equals(warehouse)) {
@@ -248,6 +253,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     Map<String, Object> closeEntryMap = omstruckOrderMapper.selecrCloseEntryMes(saleMaterialId);
                     closeEntryMap.put("reason","金蝶关闭分录,物流同步关闭");
                     closeEntryMap.put("closeEntryFlag",1);
+                    try {
+                        saleLogUtil.logSaleOrder(amsSaleMaterial.getSaleOrderId(),"金蝶关闭分录,物流同步关闭,分录主键为:" + amsSaleMaterial.getSaleMaterialId(),"金蝶" + userName,SaleLogUtil.CLOSE);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                     //判断该分录有没有运单
                     try {
                         amsFeign.closeSteelMaterialId(closeEntryMap);
@@ -272,6 +282,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrder.setInsertUpdateRemark(insertUpdateRemark);
                 amsSaleOrder.setUpdateUsername(userName.toString());
             }
+            try {
+                saleLogUtil.logSaleOrder(amsSaleOrder.getSaleOrderId(),"金蝶反关闭销售订单,物流同步反关闭" + insertUpdateRemark,"金蝶" + userName,SaleLogUtil.OPEN);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             //判断当前销售订单的一个状态
             if(saleOrderIsDelete.compareTo(new BigDecimal(0)) != 0) {
                 //// 反关闭销售订单下的所有分录
@@ -325,6 +340,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     AmsSaleMaterial amsSaleMaterial = amsSaleMaterials.get(0);
                     //result += amsSaleMaterialMapper.unCloseSaleMaterial(amsSaleMaterial.getSaleMaterialId());
                     BigDecimal saleMaterialId = amsSaleMaterial.getSaleMaterialId();
+                    try {
+                        saleLogUtil.logSaleOrder(amsSaleMaterial.getSaleOrderId(),"金蝶反关闭分录,物流同步反关闭,分录主键为:" + amsSaleMaterial.getSaleMaterialId(),"金蝶" + userName,SaleLogUtil.OPEN);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                     //判断该分录有没有运单
                     try {
                         amsFeign.adverseCloseSaleMaterialByEas(saleMaterialId);
@@ -345,6 +365,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrder.setUpdateUsername(userName.toString());
             }
             result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
+            try {
+                saleLogUtil.logSaleOrder(amsSaleOrder.getSaleOrderId(),"金蝶反审批销售订单,物流同步反审批" + insertUpdateRemark,"金蝶" + userName,SaleLogUtil.OPEN);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             //反审的订单需将下面的运输订单关闭
             try {
                 try{
@@ -402,6 +427,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             }catch (Exception e){
                 e.printStackTrace();
             }
+            try {
+                saleLogUtil.logSaleOrder(amsSaleOrder.getSaleOrderId(),"金蝶审批销售订单,物流同步审批" + insertUpdateRemark,"金蝶" + userName,SaleLogUtil.OPEN);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             // 如果是财务审批后，将不可作业的运输订单改为已接收状态
             //反关闭这个销售订单下面被关闭的运单
             try {
@@ -483,6 +513,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrder.setUpdateUsername("admin");
                 amsSaleOrder.setReceiveId(receiveId);
                 amsSaleOrder.setShipperId(shipperId);
+                try {
+                    saleLogUtil.logSaleOrder(saleOrderId,"金蝶新增销售订单,物流同步新增" + insertUpdateRemark,"金蝶" + userName,SaleLogUtil.INSERT);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 // 订单日期
                 try {
                     Date saleOrderBizDate = sdf.parse(saleOrderBizDateStr);
@@ -662,6 +697,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrder.setUpdateTime(new Date());
                 amsSaleOrder.setShipperId(shipperId);
                 amsSaleOrder.setReceiveId(receiveId);
+                try {
+                    saleLogUtil.logSaleOrder(amsSaleOrder.getSaleOrderId(),"金蝶提交销售订单,物流同步提交" + insertUpdateRemark,"金蝶" + userName,SaleLogUtil.UPDATE);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 if (isSelfMention != null) {
                     if (isSelfMention.equals("CARRY")) {
                         amsSaleOrder.setSaleOrderIsselfMention("是");
@@ -813,6 +853,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                                 result += amsSaleMaterialMapper.updateSaleMaterialByEasId(easId);
                                 //result += amsSaleMaterialMapper.deleteAstmBystId(easId);
                                 result += amsSaleMaterialMapper.updateAstmBystId(easId);
+                                try {
+                                    saleLogUtil.logSaleOrder(amsSaleOrder.getSaleOrderId(),"金蝶提交销售订单,物流对比分录,修改分录指向" + easId ,"金蝶" + userName,SaleLogUtil.OPEN);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
                             }
                         } catch (Exception e) {
                             e.printStackTrace();

src/main/java/com/steerinfo/dil/util/SaleLogUtil.java

@@ -144,6 +144,50 @@ public class SaleLogUtil {
         }
     }
 
+    public int logSaleOrder(BigDecimal saleOrderId,String descriptoin,String userName,int oprationType){
+        try{
+            //List<BigDecimal> orderIds = saleLogMapper.getOrderIds(orderNumber);
+            List<SaleLog> list =new ArrayList<>();
+            //for(BigDecimal orderId:orderIds){
+                SaleLog saleLog=new SaleLog();
+                saleLog.setResultId(saleLogMapper.selectMaxId());
+                //saleLog.setOrderId(orderId);
+                saleLog.setSaleOrderId(saleOrderId);
+                saleLog.setDescription(descriptoin);
+                //saleLog.setJsonData(""+map);
+                saleLog.setInsertTime(new Date());
+                saleLog.setInsertUsername(userName);
+                switch (oprationType){
+                    case INSERT:
+                        saleLog.setOprationType("新增");
+                        break;
+                    case UPDATE:
+                        saleLog.setOprationType("修改");
+                        break;
+                    case DELETE:
+                        saleLog.setOprationType("删除");
+                        break;
+                    case OPEN:
+                        saleLog.setOprationType("启用");
+                        break;
+                    case CLOSE:
+                        saleLog.setOprationType("关闭");
+                        break;
+                    default:
+                        saleLog.setOprationType("未知操作");
+                }
+                list.add(saleLog);
+            //}
+            return saleLogMapper.batchInsert(list);
+        }catch (Exception e){
+            e.printStackTrace();
+            return -1;
+        }
+    }
+
+
+
+
 
     /**
      * 插入运输订单的操作日志