Merge remote-tracking branch 'origin/master'

YYC

2023-10-27 8ae76246e2eb899335594d2da69ae0aea61f9460

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

@@ -87,7 +87,7 @@
                apiData.setHwdm(api1105.getHwdm());

                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety());
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0,3));
                apiData.setLspzdm(mappingCode);

                //粮食性质
@@ -101,8 +101,11 @@
                apiData.setShnd(fz40DepotStore.getFoodYear());

                //产地代码
                String cd = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
                apiData.setCd(cd);
                mappingCode = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiData.getHwdm().substring(2,8);
                }
                apiData.setCd(mappingCode);

                apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "保管员" : api1105.getBgy());
                //粮权归属单位