Merge remote-tracking branch 'origin/master'

ws

2024-10-31 5408346178dd12b7ab78fb51c76f59c300a7e153

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java

@@ -47,6 +47,8 @@
    @Autowired
    private Api1206Rep api1206Rep;
    @Autowired
    private Api1310Rep api1310Rep;
    @Autowired
    private Api1404Rep api1404Rep;
    @Autowired
    private ApiCommonService commonService;
@@ -157,6 +159,17 @@
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
                apiData.setLsdjdm(mappingCode);

                //质检报告单号
                List<Api1310> dataByHwdm = api1310Rep.getDataByHwdm(apiData.getHwdm(), "02");
                apiData.setZjbgdh(dataByHwdm.get(0).getZjbgdh());

                //生成方式
                apiData.setScfs(sysData.getRecordStatus().equals("ADD") ? "2" : "1");

                //手动补录原因
                apiData.setSdblyy("库区停电，无法上传");


                //粮食性质
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                apiData.setLsxzdm(mappingCode);