11816 пре 3 дана
родитељ
комит
445bd28cca

+ 4
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/StockServiceImpl.java Прегледај датотеку

111
                         ctrl.setServiceType(purchaseOrder.getServiceType());
111
                         ctrl.setServiceType(purchaseOrder.getServiceType());
112
                         ctrl.setBizType(purchaseOrder.getBizType());
112
                         ctrl.setBizType(purchaseOrder.getBizType());
113
                         ctrl.setBizProductType(purchaseOrder.getBizProductType());
113
                         ctrl.setBizProductType(purchaseOrder.getBizProductType());
114
+                        ctrl.setFcat(1);
114
 
115
 
115
                     }
116
                     }
116
                 }else if (exe1.getFmodalid()==24){
117
                 }else if (exe1.getFmodalid()==24){
135
                         ctrl.setRateUsd(salesOrder.getRateUsd());
136
                         ctrl.setRateUsd(salesOrder.getRateUsd());
136
                         ctrl.setRate(salesOrder.getRate());
137
                         ctrl.setRate(salesOrder.getRate());
137
                         ctrl.setTrdCtry(salesOrder.getTrdCtry());
138
                         ctrl.setTrdCtry(salesOrder.getTrdCtry());
139
+                        ctrl.setFcat(-1);
138
                     }
140
                     }
139
                 }
141
                 }
140
                 //插入主表
142
                 //插入主表
177
                 dtl.setInTaxRate(exe1.getInTaxRate());// 对应inf_exe1.inTaxRate
179
                 dtl.setInTaxRate(exe1.getInTaxRate());// 对应inf_exe1.inTaxRate
178
                 dtl.setSMRNo(exe1.getSMRNo());
180
                 dtl.setSMRNo(exe1.getSMRNo());
179
                 dtl.setFphno(exe1.getFphno());// 对应inf_exe1.SMRNo
181
                 dtl.setFphno(exe1.getFphno());// 对应inf_exe1.SMRNo
182
+                dtl.setQiChu("1");
180
 
183
 
181
                 if (exe1.getFmodalid()==22){
184
                 if (exe1.getFmodalid()==22){
182
                     POrderDtl pOrderDtl=pOrderDtlMapper.selectByPurchaseContractId(purchasecontract.getId());
185
                     POrderDtl pOrderDtl=pOrderDtlMapper.selectByPurchaseContractId(purchasecontract.getId());
209
 
212
 
210
                     }
213
                     }
211
                 }else if (exe1.getFmodalid()==24){
214
                 }else if (exe1.getFmodalid()==24){
215
+                    dtl.setFcat(-1);
212
                     String id =mdkcctrlMapper.selectBySno(exe1.getSfno());
216
                     String id =mdkcctrlMapper.selectBySno(exe1.getSfno());
213
                     salesContract = salesContractExeMapper.selectByFno(exe1.getSfno());
217
                     salesContract = salesContractExeMapper.selectByFno(exe1.getSfno());
214
                     if (id!=null) {
218
                     if (id!=null) {

+ 8
- 8
src/main/java/com/example/backend/pAndSExe/util/PsExeExcelUtil.java Прегледај датотеку

356
             entity.setCreateBy(createBy);
356
             entity.setCreateBy(createBy);
357
         }
357
         }
358
 
358
 
359
-        int danhaochongfu=infExe1Mapper.selectFnoByPfnoCount(dto.getPfno());
360
-        if (danhaochongfu==0) {
359
+        /*int danhaochongfu=infExe1Mapper.selectFnoByPfnoCount(dto.getPfno());
360
+        if (danhaochongfu==0) {*/
361
             //6.生成流水号
361
             //6.生成流水号
362
             InfExe1Amount infExe1Amount = new InfExe1Amount();
362
             InfExe1Amount infExe1Amount = new InfExe1Amount();
363
             infExe1Amount.setCreateTime(new Date());
363
             infExe1Amount.setCreateTime(new Date());
369
             StringBuilder rukudanhao = sb.append("POIS").append(year).append(String.format(String.valueOf(id))).append("-QC");
369
             StringBuilder rukudanhao = sb.append("POIS").append(year).append(String.format(String.valueOf(id))).append("-QC");
370
             entity.setFno(rukudanhao.toString());
370
             entity.setFno(rukudanhao.toString());
371
             entity.setFphno(rukudanhao + "-01");
371
             entity.setFphno(rukudanhao + "-01");
372
-        }else {
372
+        /*}else {
373
             String fno=infExe1Mapper.selectFnoByPfno(dto.getPfno());
373
             String fno=infExe1Mapper.selectFnoByPfno(dto.getPfno());
374
             entity.setFno(fno);
374
             entity.setFno(fno);
375
             StringBuilder sb1=new StringBuilder();
375
             StringBuilder sb1=new StringBuilder();
376
             String picishu = String.format("%02d", Long.parseLong(String.valueOf(danhaochongfu+1)));
376
             String picishu = String.format("%02d", Long.parseLong(String.valueOf(danhaochongfu+1)));
377
             sb1.append(fno).append("-").append(picishu);
377
             sb1.append(fno).append("-").append(picishu);
378
             entity.setFphno(sb1.toString());
378
             entity.setFphno(sb1.toString());
379
-        }
379
+        }*/
380
         entity.setFmodalid(22);
380
         entity.setFmodalid(22);
381
         // 拆分itemno-sdesc-brand字段
381
         // 拆分itemno-sdesc-brand字段
382
         if (dto.getItemnoSdescBrand() != null&& !dto.getItemnoSdescBrand().isEmpty()) {
382
         if (dto.getItemnoSdescBrand() != null&& !dto.getItemnoSdescBrand().isEmpty()) {
553
         }
553
         }
554
 
554
 
555
         // 6. 流水号生成逻辑
555
         // 6. 流水号生成逻辑
556
-        int danhaochongfu = infExe1Mapper.selectFnoBySfnoCount(dto.getSfno());
557
-        if (danhaochongfu == 0) {
556
+        /*int danhaochongfu = infExe1Mapper.selectFnoBySfnoCount(dto.getSfno());
557
+        if (danhaochongfu == 0) {*/
558
             InfExe1Amount infExe1Amount = new InfExe1Amount();
558
             InfExe1Amount infExe1Amount = new InfExe1Amount();
559
             infExe1Amount.setCreateTime(new Date());
559
             infExe1Amount.setCreateTime(new Date());
560
             infExe1AmountMapper.insert(infExe1Amount);
560
             infExe1AmountMapper.insert(infExe1Amount);
565
             StringBuilder rukudanhao = sb.append("SOOS").append(year).append(String.format(String.valueOf(id))).append("-QC");
565
             StringBuilder rukudanhao = sb.append("SOOS").append(year).append(String.format(String.valueOf(id))).append("-QC");
566
             entity.setFno(rukudanhao.toString());
566
             entity.setFno(rukudanhao.toString());
567
             entity.setFphno(rukudanhao + "-01");
567
             entity.setFphno(rukudanhao + "-01");
568
-        } else {
568
+        /*} else {
569
             String fno = infExe1Mapper.selectFnoBySfno(dto.getSfno());
569
             String fno = infExe1Mapper.selectFnoBySfno(dto.getSfno());
570
             entity.setFno(fno);
570
             entity.setFno(fno);
571
             StringBuilder sb1 = new StringBuilder();
571
             StringBuilder sb1 = new StringBuilder();
572
             String picishu = String.format("%02d", Long.parseLong(String.valueOf(danhaochongfu + 1)));
572
             String picishu = String.format("%02d", Long.parseLong(String.valueOf(danhaochongfu + 1)));
573
             sb1.append(fno).append("-").append(picishu);
573
             sb1.append(fno).append("-").append(picishu);
574
             entity.setFphno(sb1.toString());
574
             entity.setFphno(sb1.toString());
575
-        }
575
+        }*/
576
         entity.setFmodalid(24); //
576
         entity.setFmodalid(24); //
577
 
577
 
578
         // 7. 拆分itemno-sdesc-brand字段(与InfExe1一致)
578
         // 7. 拆分itemno-sdesc-brand字段(与InfExe1一致)

Loading…
Откажи
Сачувај