Просмотр исходного кода

1 货值暂估添加合同字段,添加商品库字段,修改截取字段

2 出入库删除空指针控制,订单为空不准许入库
11816 1 месяц назад
Родитель
Сommit
6ef836a506

+ 3
- 0
src/main/java/com/example/backend/pAndSExe/controller/PsExeController.java Просмотреть файл

53
 
53
 
54
     @Autowired
54
     @Autowired
55
     private DailijiesuanSettleService dailijiesuanSettleService;
55
     private DailijiesuanSettleService dailijiesuanSettleService;
56
+    @Autowired
57
+    private HuozhizanguSettleService huozhizanguSettleService;
56
 
58
 
57
     /**
59
     /**
58
      * 1. 导入采、销执行表Excel文件(单独)
60
      * 1. 导入采、销执行表Excel文件(单独)
81
             resultMsg.append("收款认领结算业务:").append(shoukuanrenlingSettleService.importShoukuanrenlingInfToSettle()).append(";");
83
             resultMsg.append("收款认领结算业务:").append(shoukuanrenlingSettleService.importShoukuanrenlingInfToSettle()).append(";");
82
             resultMsg.append("销售结算开票业务:").append(xiaoshoujiesuankaipiaoSettleService.importXiaoshoujiesuankaipiaoInfToSettle()).append(";");
84
             resultMsg.append("销售结算开票业务:").append(xiaoshoujiesuankaipiaoSettleService.importXiaoshoujiesuankaipiaoInfToSettle()).append(";");
83
             resultMsg.append("代理结算业务:").append(dailijiesuanSettleService.importDailijiesuanInfToSettle()).append(";");
85
             resultMsg.append("代理结算业务:").append(dailijiesuanSettleService.importDailijiesuanInfToSettle()).append(";");
86
+            resultMsg.append("货值暂估业务:").append(huozhizanguSettleService.importHuozhizanguInfToSettle()).append(";");
84
             return Result.success(resultMsg.toString(), "所有业务批量导入成功");
87
             return Result.success(resultMsg.toString(), "所有业务批量导入成功");
85
         } catch (Exception e) {
88
         } catch (Exception e) {
86
             logger.error("所有业务批量导入失败", e);
89
             logger.error("所有业务批量导入失败", e);

+ 1
- 1
src/main/java/com/example/backend/pAndSExe/mapper/InfHuozhizanguMapper.java Просмотреть файл

17
     List<InfHuozhizangu> selectValidData();
17
     List<InfHuozhizangu> selectValidData();
18
 
18
 
19
 
19
 
20
-    @Update("UPDATE SGGMINFT.INF_JINXIANGFAPIAO SET dataStatus = '1' WHERE ID = #{id}")
20
+    @Update("UPDATE SGGMINFT.INF_HUOZHIZANGU SET dataStatus = '1' WHERE ID = #{id}")
21
 
21
 
22
     void updateStatusById(String id);
22
     void updateStatusById(String id);
23
 }
23
 }

+ 2
- 0
src/main/java/com/example/backend/pAndSExe/mapper/PurchasecontractMapper.java Просмотреть файл

18
     @Select("select sdesc from SGGMIIP.purchaseDtl where rid =#{id} and del_flag != '1' limit 1")
18
     @Select("select sdesc from SGGMIIP.purchaseDtl where rid =#{id} and del_flag != '1' limit 1")
19
     String selectSdesc(Long id);
19
     String selectSdesc(Long id);
20
 
20
 
21
+    @Select("select id from SGGMIIP.purchaseDtl where rid =#{id} and itemno =#{itemno} and del_flag != '1' limit 1")
22
+    Long selectDtlIdByIdAndItemNo(Long id, String itemno);
21
 }
23
 }

+ 7
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/HuozhizanguSettleServiceImpl.java Просмотреть файл

32
     @Autowired
32
     @Autowired
33
     private PurchasecontractMapper purchasecontractMapper;
33
     private PurchasecontractMapper purchasecontractMapper;
34
 
34
 
35
+
35
     @Autowired
36
     @Autowired
36
     private POrderDtlMapper pOrderDtlMapper;
37
     private POrderDtlMapper pOrderDtlMapper;
37
 
38
 
53
                 PurchaseOrder purchaseOrder = purchaseorderMapper.selectByPurchaseContract(inf.getPono());
54
                 PurchaseOrder purchaseOrder = purchaseorderMapper.selectByPurchaseContract(inf.getPono());
54
                 Purchasecontract purchasecontract = purchasecontractMapper.selectByFno(inf.getPono());
55
                 Purchasecontract purchasecontract = purchasecontractMapper.selectByFno(inf.getPono());
55
 
56
 
57
+
58
+
56
                 ProvIn provIn = new ProvIn();
59
                 ProvIn provIn = new ProvIn();
57
                 Long provInId = IdWorker.getId();
60
                 Long provInId = IdWorker.getId();
58
                 provIn.setId(provInId);
61
                 provIn.setId(provInId);
77
 
80
 
78
 
81
 
79
                 Shangpinku shangpinku=shangpinkuMapper.selectBySdesc(inf.getSdesc());
82
                 Shangpinku shangpinku=shangpinkuMapper.selectBySdesc(inf.getSdesc());
83
+                Long purchaseDtlId=purchasecontractMapper.selectDtlIdByIdAndItemNo(purchasecontract.getId(),shangpinku.getItemno());
84
+
80
 
85
 
81
                 ProvInDtl provInDtl = new ProvInDtl();
86
                 ProvInDtl provInDtl = new ProvInDtl();
82
                 Long dtlId = IdWorker.getId();
87
                 Long dtlId = IdWorker.getId();
96
                 provInDtl.setFno(inf.getFno());
101
                 provInDtl.setFno(inf.getFno());
97
                 provInDtl.setPoOrderNo(inf.getPono());
102
                 provInDtl.setPoOrderNo(inf.getPono());
98
                 provInDtl.setCurcypo(inf.getCurcy());
103
                 provInDtl.setCurcypo(inf.getCurcy());
104
+                provInDtl.setPoid(purchaseDtlId);
105
+
99
 
106
 
100
                 provInDtlMapper.insert(provInDtl);
107
                 provInDtlMapper.insert(provInDtl);
101
 
108
 

Загрузка…
Отмена
Сохранить