1 修改出入库逻辑

src/main/java/com/example/backend/pAndSExe/service/impl/StockServiceImpl.java

@@ -111,6 +111,7 @@ public class StockServiceImpl implements StockService {
                         ctrl.setServiceType(purchaseOrder.getServiceType());
                         ctrl.setBizType(purchaseOrder.getBizType());
                         ctrl.setBizProductType(purchaseOrder.getBizProductType());
+                        ctrl.setFcat(1);
 
                     }
                 }else if (exe1.getFmodalid()==24){
@@ -135,6 +136,7 @@ public class StockServiceImpl implements StockService {
                         ctrl.setRateUsd(salesOrder.getRateUsd());
                         ctrl.setRate(salesOrder.getRate());
                         ctrl.setTrdCtry(salesOrder.getTrdCtry());
+                        ctrl.setFcat(-1);
                     }
                 }
                 //插入主表
@@ -177,6 +179,7 @@ public class StockServiceImpl implements StockService {
                 dtl.setInTaxRate(exe1.getInTaxRate());// 对应inf_exe1.inTaxRate
                 dtl.setSMRNo(exe1.getSMRNo());
                 dtl.setFphno(exe1.getFphno());// 对应inf_exe1.SMRNo
+                dtl.setQiChu("1");
 
                 if (exe1.getFmodalid()==22){
                     POrderDtl pOrderDtl=pOrderDtlMapper.selectByPurchaseContractId(purchasecontract.getId());
@@ -209,6 +212,7 @@ public class StockServiceImpl implements StockService {
 
                     }
                 }else if (exe1.getFmodalid()==24){
+                    dtl.setFcat(-1);
                     String id =mdkcctrlMapper.selectBySno(exe1.getSfno());
                     salesContract = salesContractExeMapper.selectByFno(exe1.getSfno());
                     if (id!=null) {

src/main/java/com/example/backend/pAndSExe/util/PsExeExcelUtil.java

@@ -356,8 +356,8 @@ public class PsExeExcelUtil {
             entity.setCreateBy(createBy);
         }
 
-        int danhaochongfu=infExe1Mapper.selectFnoByPfnoCount(dto.getPfno());
-        if (danhaochongfu==0) {
+        /*int danhaochongfu=infExe1Mapper.selectFnoByPfnoCount(dto.getPfno());
+        if (danhaochongfu==0) {*/
             //6.生成流水号
             InfExe1Amount infExe1Amount = new InfExe1Amount();
             infExe1Amount.setCreateTime(new Date());
@@ -369,14 +369,14 @@ public class PsExeExcelUtil {
             StringBuilder rukudanhao = sb.append("POIS").append(year).append(String.format(String.valueOf(id))).append("-QC");
             entity.setFno(rukudanhao.toString());
             entity.setFphno(rukudanhao + "-01");
-        }else {
+        /*}else {
             String fno=infExe1Mapper.selectFnoByPfno(dto.getPfno());
             entity.setFno(fno);
             StringBuilder sb1=new StringBuilder();
             String picishu = String.format("%02d", Long.parseLong(String.valueOf(danhaochongfu+1)));
             sb1.append(fno).append("-").append(picishu);
             entity.setFphno(sb1.toString());
-        }
+        }*/
         entity.setFmodalid(22);
         // 拆分itemno-sdesc-brand字段
         if (dto.getItemnoSdescBrand() != null&& !dto.getItemnoSdescBrand().isEmpty()) {
@@ -553,8 +553,8 @@ public class PsExeExcelUtil {
         }
 
         // 6. 流水号生成逻辑
-        int danhaochongfu = infExe1Mapper.selectFnoBySfnoCount(dto.getSfno());
-        if (danhaochongfu == 0) {
+        /*int danhaochongfu = infExe1Mapper.selectFnoBySfnoCount(dto.getSfno());
+        if (danhaochongfu == 0) {*/
             InfExe1Amount infExe1Amount = new InfExe1Amount();
             infExe1Amount.setCreateTime(new Date());
             infExe1AmountMapper.insert(infExe1Amount);
@@ -565,14 +565,14 @@ public class PsExeExcelUtil {
             StringBuilder rukudanhao = sb.append("SOOS").append(year).append(String.format(String.valueOf(id))).append("-QC");
             entity.setFno(rukudanhao.toString());
             entity.setFphno(rukudanhao + "-01");
-        } else {
+        /*} else {
             String fno = infExe1Mapper.selectFnoBySfno(dto.getSfno());
             entity.setFno(fno);
             StringBuilder sb1 = new StringBuilder();
             String picishu = String.format("%02d", Long.parseLong(String.valueOf(danhaochongfu + 1)));
             sb1.append(fno).append("-").append(picishu);
             entity.setFphno(sb1.toString());
-        }
+        }*/
         entity.setFmodalid(24); //
 
         // 7. 拆分itemno-sdesc-brand字段（与InfExe1一致）