-
导出
+
@@ -188,7 +188,7 @@
{
title:'企业',
align:"center",
- dataIndex: 'enterprisesId'
+ dataIndex: 'departName'
},
{
title: '操作',
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
index 4d479e21..7e731d06 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
@@ -74,6 +74,29 @@ public class CustomerInvoiceController extends JeecgController
queryPageList1(CustomerInvoice customerInvoice,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(customerInvoice, req.getParameterMap());
+ queryWrapper.eq("user_id",customerInvoice.getUserId());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = customerInvoiceService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
/**
* 添加
*
@@ -243,7 +266,27 @@ public class CustomerInvoiceController extends JeecgController shang(@RequestParam(name="id",required=true) String id) {
+ System.out.println(id);
+ customerInvoiceService.up(id);
+ return Result.ok("升序成功");
+ }
+
+
+ @AutoLog(value = "排序")
+ @ApiOperation(value="排序", notes="排序")
+ @GetMapping(value = "/down")
+ public Result xia(@RequestParam(name="id",required=true) String id) {
+ int a=customerInvoiceService.findSort(id);
+ if(a==0){
+ return Result.error("当前已经是最低级别！！！");}else {
+ customerInvoiceService.down(id);
+ return Result.ok("降序成功");
+ }
+ }
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java
index 56b2e273..ee8d8130 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java
@@ -3,6 +3,8 @@ package org.jeecg.modules.demo.customerinvoice.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +16,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface CustomerInvoiceMapper extends BaseMapper {
+
+ @Select("select sort from customer_invoice where id=#{id} ")
+ Integer upfindsort(String id);
+
+ @Select("select id from customer_invoice where sort=#{i} ")
+ String findproid(int i);
+
+ @Update("update customer_invoice set sort =#{i} where id = #{id} ")
+ void innew(String id, int i);
+
+ @Update("update customer_invoice set sort =#{sort} where id = #{proid} ")
+ void innewpro(String proid, Integer sort);
+
+ @Select("select sort from customer_invoice where id=#{id} ")
+ int findSort(String id);
+
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java
index c8ac60f7..5988b99a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java
@@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ICustomerInvoiceService extends IService {
+ void down(String id);
+
+ int findSort(String id);
+
+ void up(String id);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java
index 47804111..9cade0cc 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.customerinvoice.service.impl;
import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice;
import org.jeecg.modules.demo.customerinvoice.mapper.CustomerInvoiceMapper;
import org.jeecg.modules.demo.customerinvoice.service.ICustomerInvoiceService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,37 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class CustomerInvoiceServiceImpl extends ServiceImpl implements ICustomerInvoiceService {
+ @Autowired
+ CustomerInvoiceMapper customerInvoiceMapper;
+
+ @Override
+ public void up(String id) {
+ Integer sort = customerInvoiceMapper.upfindsort(id);
+ if (sort>0) {
+ //升序前找到后一个排序
+ String proid = customerInvoiceMapper.findproid(sort + 1);
+ if (proid!="") {
+ //调换排序
+ customerInvoiceMapper.innew(id,sort+1);
+ customerInvoiceMapper.innewpro(proid,sort);
+ }
+ }
+ }
+
+ @Override
+ public int findSort(String id) {
+ return customerInvoiceMapper.findSort(id);
+ }
+
+ @Override
+ public void down(String id) {
+ Integer sort = customerInvoiceMapper.upfindsort(id);
+ if (sort>0) {
+ String proid = customerInvoiceMapper.findproid(sort - 1);
+ if (proid!="") {
+ customerInvoiceMapper.innew(id,sort-1);
+ customerInvoiceMapper.innewpro(proid,sort);
+ }
+ }
+ }
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java
index b2830be6..07941a6f 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/IDeliveryService.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.delivery.service;
import org.jeecg.modules.demo.delivery.entity.Delivery;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.productplan.entity.ZyPlanProcess;
/**
* @Description: 出库表
@@ -12,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IDeliveryService extends IService {
+ void sendToRepository(String planId);
+
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java
index f866ebc4..7aa4f2bd 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/delivery/service/impl/DeliveryServiceImpl.java
@@ -1,20 +1,97 @@
package org.jeecg.modules.demo.delivery.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.demo.accessories.entity.ZyAccessories;
+import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService;
import org.jeecg.modules.demo.delivery.entity.Delivery;
import org.jeecg.modules.demo.delivery.mapper.DeliveryMapper;
import org.jeecg.modules.demo.delivery.service.IDeliveryService;
+import org.jeecg.modules.demo.fabric.entity.ZyFabric;
+import org.jeecg.modules.demo.fabric.service.IZyFabricService;
+import org.jeecg.modules.productplan.entity.ZyPlanAccessories;
+import org.jeecg.modules.productplan.entity.ZyPlanFabric;
+import org.jeecg.modules.productplan.entity.ZyProductPlan;
+import org.jeecg.modules.productplan.service.IZyPlanAccessoriesService;
+import org.jeecg.modules.productplan.service.IZyPlanFabricService;
+import org.jeecg.modules.productplan.service.IZyProductPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
/**
* @Description: 出库表
* @Author: jeecg-boot
- * @Date: 2023-01-10
+ * @Date: 2023-01-10
* @Version: V1.0
*/
@Service
public class DeliveryServiceImpl extends ServiceImpl implements IDeliveryService {
+ @Autowired
+ private IZyProductPlanService iZyProductPlanService;
+
+ @Autowired
+ private IZyPlanFabricService iZyPlanFabricService;
+
+ @Autowired
+ private IZyPlanAccessoriesService iZyPlanAccessoriesService;
+
+ @Autowired
+ IZyFabricService iZyFabricService;
+
+ @Autowired
+ private IZyAccessoriesService iZyAccessoriesService;
+
+ @Override
+ public void sendToRepository(String planId) {
+ ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
+ Optional.ofNullable(zyProductPlan).orElseThrow(() -> new JeecgBootException("生产计划不存在!"));
+
+ List fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper()
+ .eq(ZyPlanFabric::getPlanId, planId));
+ List deliveryList4Fabric = new LinkedList<>();
+ Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> {
+ Delivery delivery = new Delivery();
+ delivery.setDeliveryReason("0");
+ delivery.setItemType("0");
+ delivery.setAmount(e.getAmount().doubleValue());
+// delivery.setDeliveryTime(new Date());
+// delivery.setCarrierId("TODO");
+// delivery.setAdminId("TODO");
+// delivery.setStorehouseId("TODO");
+ ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId());
+ if (!ObjectUtils.isEmpty(zyFabric)) {
+ delivery.setItemCode(zyFabric.getFabricNumber());
+ }
+ deliveryList4Fabric.add(delivery);
+ });
+ this.saveBatch(deliveryList4Fabric);
+
+ List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper()
+ .eq(ZyPlanAccessories::getPlanId, planId));
+ List deliveryList4accessories = new LinkedList<>();
+ Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> {
+ Delivery delivery2 = new Delivery();
+ delivery2.setDeliveryReason("0");
+ delivery2.setItemType("1");
+ delivery2.setAmount(e.getAmount().doubleValue());
+// delivery2.setDeliveryTime(new Date());
+// delivery2.setCarrierId("TODO");
+// delivery2.setAdminId("TODO");
+// delivery2.setStorehouseId("TODO");
+ ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId());
+ if (!ObjectUtils.isEmpty(zyAccessories)) {
+ delivery2.setItemCode(zyAccessories.getNums());
+ }
+ deliveryList4accessories.add(delivery2);
+ });
+ this.saveBatch(deliveryList4accessories);
+ }
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
index 63b0afe0..bd81fbe7 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
@@ -515,51 +515,52 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper()
- .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId()));
- List deliveryList4Fabric = new LinkedList<>();
- Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> {
- Delivery delivery = new Delivery();
- delivery.setDeliveryReason("0");
- delivery.setDeliveryTime(new Date());
- delivery.setItemType("0");
- delivery.setAmount(e.getAmount().doubleValue());
- delivery.setCarrierId("admin");
- delivery.setAdminId("admin");
- delivery.setStorehouseId("TODO");
- ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId());
- if (!ObjectUtils.isEmpty(zyFabric)) {
- delivery.setItemCode(zyFabric.getFabricNumber());
- }
- deliveryList4Fabric.add(delivery);
- });
- iDeliveryService.saveBatch(deliveryList4Fabric);
-
- List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper()
- .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId()));
- List deliveryList4accessories = new LinkedList<>();
- Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> {
- Delivery delivery2 = new Delivery();
- delivery2.setDeliveryReason("0");
- delivery2.setDeliveryTime(new Date());
- delivery2.setItemType("1");
- delivery2.setAmount(e.getAmount().doubleValue());
- delivery2.setCarrierId("admin");
- delivery2.setAdminId("admin");
- delivery2.setStorehouseId("TODO");
- ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId());
- if (!ObjectUtils.isEmpty(zyAccessories)) {
- delivery2.setItemCode(zyAccessories.getNums());
- }
- deliveryList4accessories.add(delivery2);
- });
- iDeliveryService.saveBatch(deliveryList4accessories);
+// String planId = zyPlanProcess.getPlanId();
+// ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
+// if (ObjectUtils.isEmpty(zyProductPlan)) {
+// throw new JeecgBootException("生产计划不存在!");
+// }
+
+// List fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper()
+// .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId()));
+// List deliveryList4Fabric = new LinkedList<>();
+// Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> {
+// Delivery delivery = new Delivery();
+// delivery.setDeliveryReason("0");
+// delivery.setDeliveryTime(new Date());
+// delivery.setItemType("0");
+// delivery.setAmount(e.getAmount().doubleValue());
+// delivery.setCarrierId("admin");
+// delivery.setAdminId("admin");
+// delivery.setStorehouseId("TODO");
+// ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId());
+// if (!ObjectUtils.isEmpty(zyFabric)) {
+// delivery.setItemCode(zyFabric.getFabricNumber());
+// }
+// deliveryList4Fabric.add(delivery);
+// });
+// iDeliveryService.saveBatch(deliveryList4Fabric);
+//
+// List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper()
+// .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId()));
+// List deliveryList4accessories = new LinkedList<>();
+// Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> {
+// Delivery delivery2 = new Delivery();
+// delivery2.setDeliveryReason("0");
+// delivery2.setDeliveryTime(new Date());
+// delivery2.setItemType("1");
+// delivery2.setAmount(e.getAmount().doubleValue());
+// delivery2.setCarrierId("admin");
+// delivery2.setAdminId("admin");
+// delivery2.setStorehouseId("TODO");
+// ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId());
+// if (!ObjectUtils.isEmpty(zyAccessories)) {
+// delivery2.setItemCode(zyAccessories.getNums());
+// }
+// deliveryList4accessories.add(delivery2);
+// });
+// iDeliveryService.saveBatch(deliveryList4accessories);
+ iDeliveryService.sendToRepository(zyPlanProcess.getPlanId());
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
index e291b5b8..4915de3d 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
@@ -77,7 +77,7 @@ public class SysDepartServiceImpl extends ServiceImpl queryTreeList() {
LambdaQueryWrapper query = new LambdaQueryWrapper();
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java
index 688d576e..46179645 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java
@@ -93,6 +93,7 @@ public class WorkOrder implements Serializable {
private Integer workOrderStatus;
/**企业*/
@Excel(name = "企业", width = 15)
+ @Dict(dictTable = "sys_depart",dicText = "depart_name", dicCode = "id")
@ApiModelProperty(value = "企业")
private String enterprisesId;
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
index 2553db37..6d71b47c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
@@ -219,7 +219,7 @@ public class WorkOrderServiceImpl extends ServiceImpl cancellationWorkOrder(WorkOrder woModel) {
//ZyProduct
+ //工单
+ //-产品
+ //-工序
return null;
}