Merge remote-tracking branch 'origin/master'

WS

2023-08-22 2627c9d3c01458587f9e1873a2a0284b8a08be04

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java

@@ -71,6 +71,7 @@

            Api1208 apiData;
            Api1105 api1105;
            List<Api1208> api1208List;
            for (Fz35DepotStore fz35DepotStore : list) {

                //获取货位信息
@@ -80,6 +81,7 @@
                }

                apiData = new Api1208();
                apiData.setId(fz35DepotStore.getId());
                apiData.setHwdm(api1105.getHwdm());

                //粮食品种
@@ -135,7 +137,7 @@
                apiData.setSjzlxg(6);
                apiData.setLdtj(10000);

                apiData.setZhgxsj(new Date());
                apiData.setZhgxsj(fz35DepotStore.getUpdateDate());

                //业务id、库区编码、同步时间
                apiData.setBizId(fz35DepotStore.getId());
@@ -143,8 +145,13 @@
                apiData.setSyncTime(new Date());

                //库存每次新增
                api1208List = api1208Rep.getDataById(apiData.getId());
                if(null == api1208List || api1208List.isEmpty()){
                apiData.setCzbz(Constant.CZBZ_I);
                apiData.setId(ContextUtil.getCurTimeMillis());
                }else {
                    apiData.setCzbz(api1208List.get(0).getCzbz());
                }

                //保存数据
                api1208Rep.save(apiData);
            }