diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java index dcbb154..433b7f2 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java @@ -309,6 +309,7 @@ public class ZyjhController { if (StrUtil.isEmpty(item.getSllph())&&!ljList.isEmpty()){ item.setSllph(ljList.get(0).getSllph()); } + mpDhsjServcie.remove(Wrappers.lambdaQuery() .eq(MpDhsj::getDcCh,item.getDcCh()) .eq(MpDhsj::getDcPl,item.getDcPl()) diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index ef213ab..153ee7a 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -161,12 +161,12 @@ public class ZyjhService extends ServiceImpl { if (_strArr.length>8){ _lj.setTz(_strArr[7]); _lj.setLx(_strArr[8]); - String sl0=_strArr[4]; - String sl1=_strArr[5]; - String sl2=_strArr[6]; - //用于修正bom生成零件数量时取值错误 - _lj.setSl(0d); - this.ofStr(sl0,sl1,sl2).ifPresent(_lj::setSl); +// String sl0=_strArr[4]; +// String sl1=_strArr[5]; +// String sl2=_strArr[6]; +// //用于修正bom生成零件数量时取值错误 +// _lj.setSl(0d); +// this.ofStr(sl0,sl1,sl2).ifPresent(_lj::setSl); } if (_strArr.length>9){ _lj.setXj(_strArr[9]); diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index d3f394c..f73b5c4 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -914,7 +914,7 @@ dm_bom.wpcz as ljcz, '' as wpfl, '' as jldw, - dm_bom.ljsl as sl, + dm_bom.tlsl as sl, dm_qfxq.xzglxq as qfxqrqxz, dm_qfxq.dzglxq as qfxqrqdz, '' as gylx,