ws
2023-11-13 7f5e2fe559a2c7c7f255cb8b9aa4488f988330c6
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -5,6 +5,7 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.DateUtil;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1203Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -20,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -113,7 +115,16 @@
                if(null == sysData.getFullWeightTime()){
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
                }
                apiData.setQysj(sysData.getFullWeightTime());
                //判断业务时间与单据号是否匹配,若不匹配,则更改业务时间为单据号所在的时间
                SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
                Date time = dateFormat.parse(apiData.getRkjydh().substring(2, 8));
                int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getRegisterTime()), DateUtil.getCurZero(time));
                if(numDay != 0){
                    sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
                }
                apiData.setQysj(sysData.getRegisterTime());
                apiData.setQyrxm(sysData.getCheckUser());
                //扦样方式 2-智能随机
                apiData.setQyfs("2");
@@ -124,7 +135,7 @@
                zkj = "";
                zkl = "";
                for (Fz35CheckItem fz35CheckItem : fz35CheckItems) {
                    gbCheckList = gbCheckItemRep.findByBizCode(fz35CheckItem.getStandardId());
                    gbCheckList = gbCheckItemRep.findByCode(fz35CheckItem.getStandardId());
                    if (gbCheckList == null || gbCheckList.isEmpty()) {
                        continue;
@@ -149,10 +160,10 @@
                    apiData.setJyjg("1");
                }
                apiData.setJyrxm(sysData.getCheckUser());
                apiData.setJysj(DateUtils.addMinutes(sysData.getFullWeightTime(), 5));
                apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 90));
                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
                apiData.setLspzdm(mappingCode);
                //保管员复核