修改账套

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/controller/DyeLossController.java

@@ -55,20 +55,20 @@ public class DyeLossController extends JeecgController<DyeLoss, IDyeLossService>
         QueryWrapper<DyeLossDto> queryWrapper = new QueryWrapper<>();//初始化
         queryWrapper.eq("c.cVCCode","0105");//确定为染厂
         queryWrapper.eq("g.cRdBusType","委外发料");//选择为材料出库单
-        if(dyeLossDto.getCode()!=null&& !dyeLossDto.getCode().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getCode())){ //code;//订单号
-            queryWrapper.eq("a.cCode",dyeLossDto.getCode());
+        if(dyeLossDto.getCode()!=null&& !dyeLossDto.getCode().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getCode())){
+            queryWrapper.eq("a.cCode",dyeLossDto.getCode());//订单号
         }
-        if(dyeLossDto.getVenName()!=null && !dyeLossDto.getVenName().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getVenName())){//供应商名称
-            queryWrapper.eq("c.cVenName",dyeLossDto.getVenName());
+        if(dyeLossDto.getVenName()!=null && !dyeLossDto.getVenName().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getVenName())){
+            queryWrapper.eq("c.cVenName",dyeLossDto.getVenName());//供应商名称
         }
-        if(dyeLossDto.getOrderType()!=null && !dyeLossDto.getOrderType().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getOrderType())){//订单类型
-            queryWrapper.eq("a.iOrderType",dyeLossDto.getOrderType());
+        if(dyeLossDto.getOrderType()!=null && !dyeLossDto.getOrderType().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getOrderType())){
+            queryWrapper.eq("a.iOrderType",dyeLossDto.getOrderType());//订单类型
         }
-        if(dyeLossDto.getPlanLotNumber()!=null && !dyeLossDto.getPlanLotNumber().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getPlanLotNumber())){//计划单号
-            queryWrapper.eq("b.cPlanLotNumber",dyeLossDto.getPlanLotNumber());
+        if(dyeLossDto.getPlanLotNumber()!=null && !dyeLossDto.getPlanLotNumber().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getPlanLotNumber())){
+            queryWrapper.eq("left(a.cCode,ISNULL(NULLIF(CHARINDEX('-',a.cCode)-1,-1),len(a.cCode)))",dyeLossDto.getPlanLotNumber());//计划单号
         }
-        if(dyeLossDto.getCsocode()!=null && !dyeLossDto.getCsocode().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getCsocode())){//销售订单号
-            queryWrapper.eq("e.csocode",dyeLossDto.getCsocode());
+        if(dyeLossDto.getCsocode()!=null && !dyeLossDto.getCsocode().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getCsocode())){
+            queryWrapper.eq("b.csoordercode ",dyeLossDto.getCsocode());//销售订单号
         }
         Page<DyeLoss> page = new Page<DyeLoss>(pageNo, pageSize);
         IPage<DyeLoss> pageList = dyeLossService.selectPage(page, queryWrapper);
@@ -86,6 +86,17 @@ public class DyeLossController extends JeecgController<DyeLoss, IDyeLossService>
        return Result.ok(dyeLossService.selectVendor(venName));
     }
 
+   /* @AutoLog(value = "按供应商名称按物料分组展现每个物料的染损2")
+    @ApiOperation(value="按供应商名称按物料分组展现每个物料的染损2", notes="按供应商名称按物料分组展现每个物料的染损2")
+    @RequestMapping(value = "/vendor2",method = RequestMethod.GET)
+    public Result<?> vendor2(@RequestParam(name="venName") String venName){
+        List<DyeLoss> list=dyeLossService.selectVendor(venName);
+        if(list.size()>10){
+            list=list.subList(0,10);
+        }
+        return Result.ok(list);
+    }*/
+
     @AutoLog(value = "按供应商分组展现每个供应商的染损")
     @ApiOperation(value="按供应商分组展现每个供应商的染损", notes="按供应商分组展现每个供应商的染损")
     @RequestMapping(value = "/cInvName",method = RequestMethod.GET)
@@ -99,4 +110,5 @@ public class DyeLossController extends JeecgController<DyeLoss, IDyeLossService>
     public ModelAndView  excel() {
        return super.export("染损报表导出测试", DyeLoss.class,dyeLossService.excel());
     }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/xml/DyeLossMapper.xml

@@ -18,7 +18,7 @@
         left join OM_MODetails b on b.moid=a.moid
         left join Vendor c on c.cVenCode=a.cVenCode
         left join Inventory d on b.cInvCode=d.cInvCode
-        left join SO_SODetails e on e.iSOsID =b.iSOsID
+        --left join SO_SODetails e on e.iSOsID =b.iSOsID
         left join OM_MatSettleVouch f on  b.MODetailsID =f.MODetailsID
         left join OM_MatSettleVouchs g on g.msid=f.msid
        ${ew.customSqlSegment}
@@ -41,11 +41,11 @@
         left join OM_MODetails on OM_MODetails.moid=OM_MOMain.moid
         left join Vendor on Vendor.cVenCode=OM_MOMain.cVenCode
         left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
-				left join OM_MatSettleVouch on  OM_MODetails.MODetailsID=OM_MatSettleVouch.MODetailsID--绑定委外订单子表
+		left join OM_MatSettleVouch on  OM_MODetails.MODetailsID=OM_MatSettleVouch.MODetailsID--绑定委外订单子表
         left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
         where Vendor.cVCCode='0105' and  OM_MatSettleVouchs.cRdBusType='委外发料'
-				AND cVenName=#{value}
-				GROUP BY Inventory.cInvName,OM_MODetails.cfree1)p
+		AND cVenName=#{value}
+		GROUP BY Inventory.cInvName,OM_MODetails.cfree1)p
     </select>
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/service/impl/DyeLossServiceImpl.java

@@ -21,22 +21,22 @@ public class DyeLossServiceImpl extends ServiceImpl<DyeLossMapper, DyeLoss> impl
     @Autowired
     DyeLossMapper dyeLossMapper;
 
-    @DS("multi-one")
+    @DS("multi-three")
     public IPage<DyeLoss> selectPage(IPage<DyeLoss> page, QueryWrapper<DyeLossDto> queryWrapper) {
         return dyeLossMapper.selectPage(page,queryWrapper);
     }
 
-    @DS("multi-one")
+    @DS("multi-three")
     public List<DyeLoss> selectVendor(String name) {
         return dyeLossMapper.selectVendor(name);
     }
 
-    @DS("multi-one")
+    @DS("multi-three")
     public List<DyeLoss> selectCInvName() {
         return dyeLossMapper.selectCInvName();
     }
 
-    @DS("multi-one")
+    @DS("multi-three")
     public List<DyeLoss> excel() {
         return dyeLossMapper.excel();
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/service/impl/SupplierCapacityServiceImpl.java

@@ -29,27 +29,27 @@ public class SupplierCapacityServiceImpl extends ServiceImpl<SupplierCapacityMap
     @Autowired
     SupplierCapacityMapper supplierCapacityMapper;
 
-    @DS("multi-one")
+    @DS("multi-three")
     public List<SupplierCapacity> selectList(SupplierCapacityDto supplierCapacityDto){
         return supplierCapacityMapper.querySelect(supplierCapacityDto);
     }
 
-    @DS("multi-one")
+    @DS("multi-three")
     public List<SupplierCapacityVo1> excel1() {
         return supplierCapacityMapper.excel001();
     }
 
-    @DS("multi-one")
+    @DS("multi-three")
     public List<SupplierCapacityVo2> excel2() {
         return supplierCapacityMapper.excel002();
     }
 
-    @DS("multi-one")
+    @DS("multi-three")
     public List<SupplierCapacityVo3> excel3() {
         return supplierCapacityMapper.excel003();
     }
 
-    @DS("multi-one")
+    @DS("multi-three")
     public IPage<SupplierCapacity> selectPage(IPage<SupplierCapacity> page, QueryWrapper<SupplierCapacityDto> queryWrapper) {
         return supplierCapacityMapper.selectPage(page,queryWrapper);
     }