wwh 2 mesiacov pred
rodič
commit
4bba937079

+ 17 - 3
huimv-farm/src/main/java/vip/xiaonuo/production/controller/ProductionWritePlanController.java

@@ -14,11 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.pojo.CommonResult;
+import vip.xiaonuo.erp.entity.SysBaseFilterInfo;
 import vip.xiaonuo.production.entity.ProductionTarget;
 import vip.xiaonuo.production.entity.ProductionWritePlan;
-import vip.xiaonuo.production.param.ProductionPageParam;
-import vip.xiaonuo.production.param.ProductionParam;
-import vip.xiaonuo.production.param.ProductionWritePlanAddParam;
+import vip.xiaonuo.production.param.*;
 import vip.xiaonuo.production.service.IProductionWritePlanService;
 
 import java.text.ParseException;
@@ -68,4 +67,19 @@ public class ProductionWritePlanController {
     public CommonResult<Page<ProductionWritePlan>> page(@RequestBody ProductionPageParam pageParam) {
         return CommonResult.data(planService.page(pageParam));
     }
+
+    @PostMapping("/production-write-plan/save")
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("保存客户选择是否查看真实的实际生产量")
+    public CommonResult<CommonResult> save(@RequestBody ProductionSaveParam saveParam) {
+        return CommonResult.data(planService.save(saveParam));
+    }
+
+
+    @PostMapping("/production-write-plan/getOne")
+    @ApiOperationSupport(order = 6)
+    @ApiOperation("查看客户对于实际生产量的选择")
+    public CommonResult<SysBaseFilterInfo> getOne(@RequestBody ProductionWriteListParam writeListParam) {
+        return CommonResult.data(planService.getOne(writeListParam));
+    }
 }

+ 37 - 0
huimv-farm/src/main/java/vip/xiaonuo/production/param/ProductionSaveParam.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright [2022] [https://www.baiduc.com]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。
+ * 4.分发源码时候,请注明软件出处 https://www.baiduc.com
+ * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.baiduc.com
+ */
+package vip.xiaonuo.production.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 人员明细Id参数
+ *
+ * @author 余
+ * @date  2024/11/14 15:02
+ **/
+@Getter
+@Setter
+public class ProductionSaveParam {
+
+
+    @ApiModelProperty(value = "userId", required = true)
+    private String userId;
+
+    @ApiModelProperty(value = "填报实际产量 0 erp数据  1填报数据", required = true)
+    private Integer isErp;
+
+
+}

+ 34 - 0
huimv-farm/src/main/java/vip/xiaonuo/production/param/ProductionWriteListParam.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright [2022] [https://www.baiduc.com]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。
+ * 4.分发源码时候,请注明软件出处 https://www.baiduc.com
+ * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.baiduc.com
+ */
+package vip.xiaonuo.production.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 人员明细Id参数
+ *
+ * @author 余
+ * @date  2024/11/14 15:02
+ **/
+@Getter
+@Setter
+public class ProductionWriteListParam {
+
+
+    @ApiModelProperty(value = "userId", required = true)
+    private String userId;
+
+
+}

+ 7 - 0
huimv-farm/src/main/java/vip/xiaonuo/production/service/IProductionWritePlanService.java

@@ -2,6 +2,7 @@ package vip.xiaonuo.production.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import vip.xiaonuo.common.pojo.CommonResult;
+import vip.xiaonuo.erp.entity.SysBaseFilterInfo;
 import vip.xiaonuo.production.entity.ProductionWritePlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 import vip.xiaonuo.production.param.*;
@@ -28,4 +29,10 @@ public interface IProductionWritePlanService extends IService<ProductionWritePla
     CommonResult delete(Map<String, String> paramsMap);
 
     Page<ProductionWritePlan> page(ProductionPageParam pageParam);
+
+    //保存客户选择是否查看真实的实际生产量
+    CommonResult save(ProductionSaveParam saveParam);
+
+    //查看客户对于实际生产量的选择
+    SysBaseFilterInfo getOne(ProductionWriteListParam writeListParam);
 }

+ 36 - 0
huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionWritePlanServiceImpl.java

@@ -1,14 +1,19 @@
 package vip.xiaonuo.production.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import vip.xiaonuo.common.pojo.CommonResult;
+import vip.xiaonuo.erp.entity.SysBaseFilterInfo;
+import vip.xiaonuo.erp.mapper.SysBaseFilterInfoMapper;
 import vip.xiaonuo.production.entity.ProductionWritePlan;
 import vip.xiaonuo.production.mapper.ProductionWritePlanMapper;
 import vip.xiaonuo.production.param.ProductionPageParam;
+import vip.xiaonuo.production.param.ProductionSaveParam;
+import vip.xiaonuo.production.param.ProductionWriteListParam;
 import vip.xiaonuo.production.param.ProductionWritePlanAddParam;
 import vip.xiaonuo.production.service.IProductionWritePlanService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -37,6 +42,8 @@ public class ProductionWritePlanServiceImpl extends ServiceImpl<ProductionWriteP
     private ProductionWritePlanMapper planMapper;
     @Autowired
     private SysOrgMapper orgMapper;
+    @Autowired
+    private SysBaseFilterInfoMapper filterInfoMapper;
 
     @Override
     public CommonResult add(ProductionWritePlanAddParam writePlan) throws ParseException {
@@ -77,4 +84,33 @@ public class ProductionWritePlanServiceImpl extends ServiceImpl<ProductionWriteP
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
         return planMapper.selectPage(page, queryWrapper);
     }
+
+    @Override
+    public CommonResult save(ProductionSaveParam saveParam) {
+        Integer isErp = saveParam.getIsErp();
+        String userId = saveParam.getUserId();
+        QueryWrapper<SysBaseFilterInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId).eq("module_type", "produce");
+        SysBaseFilterInfo sysBaseFilterInfo = filterInfoMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(sysBaseFilterInfo)) {
+            SysBaseFilterInfo info = new SysBaseFilterInfo();
+            info.setModuleType("produce");
+            info.setUserId(userId);
+            info.setModuleType(isErp.toString());
+            filterInfoMapper.insert(info);
+        } else {
+            sysBaseFilterInfo.setFilter(isErp.toString());
+            filterInfoMapper.updateById(sysBaseFilterInfo);
+        }
+        return CommonResult.ok();
+    }
+
+    @Override
+    public SysBaseFilterInfo getOne(ProductionWriteListParam writeListParam) {
+        String userId = writeListParam.getUserId();
+        QueryWrapper<SysBaseFilterInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId).eq("module_type", "produce");
+        return filterInfoMapper.selectOne(queryWrapper);
+    }
+
 }