#

LSH

2022-12-05 290595946ef959de43e9b079be16285c8a4d752d

#

 src/main/java/com/zy/asrs/controller/LocDetlController.java

@@ -13,10 +13,12 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
@@ -33,6 +35,8 @@

    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private LocMastService locMastService;

    @Autowired
    private LocDetlMapper locDetlMapper;
@@ -165,6 +169,10 @@
        }else if (locDetl.getBatch().equals(locDetl.getSku())){
            return R.error("前后合同号一致，无需修改！！！");
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("F")){
            return R.error("库位号必须存在并且库位状态为“F”！！！");
        }
        try{
            LocDetl locDetlSource = locDetlService.selectItem(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch());
            if (Cools.isEmpty(locDetlSource) || (locDetl.getBatch()==null &&  locDetlSource.getBatch()!=null)){
@@ -182,12 +190,22 @@
            if (locDetlSource.getAnfme()-locDetl.getAnfme()==0){
                if (Cools.isEmpty(locDetlEnd)){
                    locDetlSource.setBatch(locDetl.getSku());
                    locDetlService.update(locDetlSource,new EntityWrapper<LocDetl>()
                            .eq("loc_no",locDetlSource.getLocNo()).eq("matnr",locDetlSource.getMatnr()).eq("batch",locDetl.getBatch()));
                    if (locDetl.getBatch()==null || locDetl.getBatch()==""){
                        locDetlService.update(locDetlSource,new EntityWrapper<LocDetl>()
                                .eq("loc_no",locDetlSource.getLocNo()).eq("matnr",locDetlSource.getMatnr()).isNull("batch").or().eq("batch",""));
                    }else {
                        locDetlService.update(locDetlSource,new EntityWrapper<LocDetl>()
                                .eq("loc_no",locDetlSource.getLocNo()).eq("matnr",locDetlSource.getMatnr()).eq("batch",locDetl.getBatch()));
                    }
                }else {
                    locDetlService.updateAnfme(locDetlEnd.getAnfme()+locDetl.getAnfme(),locDetlEnd.getLocNo(),locDetlEnd.getMatnr(),locDetlEnd.getBatch());
                    locDetlService.delete(new EntityWrapper<LocDetl>()
                            .eq("loc_no",locDetl.getLocNo()).eq("matnr",locDetl.getMatnr()).eq("batch",locDetl.getBatch()));
                    if (locDetl.getBatch()==null || locDetl.getBatch()==""){
                        locDetlService.delete(new EntityWrapper<LocDetl>()
                                .eq("loc_no",locDetlSource.getLocNo()).eq("matnr",locDetlSource.getMatnr()).isNull("batch").or().eq("batch",""));
                    }else {
                        locDetlService.delete(new EntityWrapper<LocDetl>()
                                .eq("loc_no",locDetlSource.getLocNo()).eq("matnr",locDetlSource.getMatnr()).eq("batch",locDetlSource.getBatch()));
                    }
                }
            }else if (locDetlSource.getAnfme()>locDetl.getAnfme()){
                locDetlService.updateAnfme(locDetlSource.getAnfme()-locDetl.getAnfme(),locDetlSource.getLocNo(),locDetlSource.getMatnr(),locDetlSource.getBatch());