后端修改

src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/controller/DynamicBaseBatchdbConfigController.java

@@ -139,4 +139,19 @@ public class DynamicBaseBatchdbConfigController extends BaseRESTfulController {
         ExcelUtil.exportExcel(response, list, DynamicBaseBatchdbConfig.class, "皮带秤扩展配置");
     }
 
+    @ApiOperation(value = "启用", notes = "启用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/enable/{id}")
+    public RESTfulResult enable(@PathVariable String id) {
+        boolean flag = dynamicBaseBatchdbConfigService.enable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
+
+    @ApiOperation(value = "禁用", notes = "禁用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/disable/{id}")
+    public RESTfulResult disable(@PathVariable String id) {
+        boolean flag = dynamicBaseBatchdbConfigService.disable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/mapper/DynamicBaseBatchdbConfigMapper.java

@@ -9,4 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface DynamicBaseBatchdbConfigMapper extends IBaseMapper<DynamicBaseBatchdbConfig, String> {
+    int enable(DynamicBaseBatchdbConfig config);
+    int disable(DynamicBaseBatchdbConfig config);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/mapper/DynamicBaseBatchdbConfigMapper.xml

@@ -402,5 +402,23 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
+    <!--启用-->
+    <update id="enable" parameterType="com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig">
+        update DYNAMIC_BASE_BATCHDB_CONFIG
+        set valid_flag    = '1',
+            update_man_no = #{updateManNo},
+            update_man_name = #{updateManName},
+            update_time = #{updateTime}
+        where config_no = #{id}
+    </update>
+    <!--禁用-->
+    <update id="disable"
+            parameterType="com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig">
+        update DYNAMIC_BASE_BATCHDB_CONFIG
+        set valid_flag = '0',
+            update_man_no = #{updateManNo},
+            update_man_name = #{updateManName},
+            update_time = #{updateTime}
+        where config_no = #{id}
+    </update>
 </mapper>

src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/service/IDynamicBaseBatchdbConfigService.java

@@ -20,4 +20,6 @@ import java.util.List;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IDynamicBaseBatchdbConfigService extends IBaseService<DynamicBaseBatchdbConfig, String>{
+    boolean enable(String id);
+    boolean disable(String id);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasebatchdbconfig/service/impl/DynamicBaseBatchdbConfigServiceImpl.java

@@ -1,18 +1,23 @@
 package com.jisco.dynamicweight.dynamicbasebatchdbconfig.service.impl;
 
+import cn.hutool.core.lang.Assert;
 import com.jisco.dynamicweight.dynamicbasebatchdbconfig.mapper.DynamicBaseBatchdbConfigMapper;
 import com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig;
+import com.jisco.dynamicweight.util.UserUtil;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.jisco.dynamicweight.dynamicbasebatchdbconfig.service.IDynamicBaseBatchdbConfigService;
+import org.apache.catalina.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.Date;
 import java.math.BigDecimal;
 import java.util.List;
 
 /**
  * DynamicBaseBatchdbConfig服务实现：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2021-12-24 08:42
  * 类描述
@@ -21,8 +26,8 @@ import java.util.List;
  * 作者：generator
  * 参考：
  * 描述：DynamicBaseBatchdbConfig服务实现
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @Service(value = "dynamicBaseBatchdbConfigService")
 public class DynamicBaseBatchdbConfigServiceImpl extends BaseServiceImpl<DynamicBaseBatchdbConfig, String> implements IDynamicBaseBatchdbConfigService {
@@ -35,4 +40,30 @@ public class DynamicBaseBatchdbConfigServiceImpl extends BaseServiceImpl<Dynamic
         return dynamicBaseBatchdbConfigMapper;
     }
 
+    @Override
+    public boolean enable(String id) {
+        DynamicBaseBatchdbConfig byId = this.getById(id);
+        Assert.notNull(byId, "记录不存在");
+        if (byId.getValidFlag().equals("1")) return false;
+        DynamicBaseBatchdbConfig config = new DynamicBaseBatchdbConfig();
+        config.setConfigNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseBatchdbConfigMapper.enable(config) == 1;
+    }
+
+    private void setUpdateManInfo(DynamicBaseBatchdbConfig config) {
+        config.setUpdateManNo(UserUtil.getCurrentUserId());
+        config.setUpdateManName(UserUtil.getCurrentUserName());
+        config.setUpdateTime(new Date());
+    }
+
+    @Override
+    public boolean disable(String id) {
+        DynamicBaseBatchdbConfig byId = this.getById(id);
+        if (byId.getValidFlag() == "0") return false;
+        DynamicBaseBatchdbConfig config = new DynamicBaseBatchdbConfig();
+        config.setConfigNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseBatchdbConfigMapper.disable(config) == 1;
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/controller/DynamicBaseBatchStationController.java

@@ -147,4 +147,21 @@ public class DynamicBaseBatchStationController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+
+    @ApiOperation(value = "启用", notes = "启用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/enable/{id}")
+    public RESTfulResult enable(@PathVariable String id) {
+        boolean flag = dynamicBaseBatchStationService.enable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
+
+    @ApiOperation(value = "禁用", notes = "禁用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/disable/{id}")
+    public RESTfulResult disable(@PathVariable String id) {
+        boolean flag = dynamicBaseBatchStationService.disable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/mapper/DynamicBaseBatchStationMapper.java

@@ -1,9 +1,12 @@
 package com.jisco.dynamicweight.dynamicbasebatchstation.mapper;
 
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig;
 import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface DynamicBaseBatchStationMapper extends IBaseMapper<DynamicBaseBatchStation, String> {
+    int enable(DynamicBaseBatchStation config);
+    int disable(DynamicBaseBatchStation config);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/mapper/DynamicBaseBatchStationMapper.xml

@@ -468,5 +468,23 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <!--启用-->
+  <update id="enable" parameterType="com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation">
+    update DYNAMIC_BASE_BATCH_STATION
+    set valid_flag    = '1',
+        update_man_no = #{updateManNo},
+        update_man_name = #{updateManName},
+        update_time = #{updateTime}
+    where station_no = #{id}
+  </update>
+  <!--禁用-->
+  <update id="disable"
+          parameterType="com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation">
+    update DYNAMIC_BASE_BATCH_STATION
+    set valid_flag = '0',
+        update_man_no = #{updateManNo},
+        update_man_name = #{updateManName},
+        update_time = #{updateTime}
+    where station_no = #{id}
+  </update>
 </mapper>

src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/service/IDynamicBaseBatchStationService.java

@@ -23,4 +23,7 @@ import java.util.List;
 public interface IDynamicBaseBatchStationService extends IBaseService<DynamicBaseBatchStation, String>{
 
     List<MeterBaseCalibraRelation> queryall(HashMap parmas);
+
+    boolean enable(String id);
+    boolean disable(String id);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasebatchstation/service/impl/DynamicBaseBatchStationServiceImpl.java

@@ -1,14 +1,18 @@
 package com.jisco.dynamicweight.dynamicbasebatchstation.service.impl;
 
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasebatchdbconfig.model.DynamicBaseBatchdbConfig;
 import com.jisco.dynamicweight.dynamicbasebatchstation.mapper.DynamicBaseBatchStationMapper;
 import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
 import com.jisco.dynamicweight.dynamicbasebatchstation.service.IDynamicBaseBatchStationService;
+import com.jisco.dynamicweight.util.UserUtil;
 import com.steerinfo.baseinfo.meterbasecalibrarelation.model.MeterBaseCalibraRelation;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -40,4 +44,31 @@ public class DynamicBaseBatchStationServiceImpl extends BaseServiceImpl<DynamicB
     public List<MeterBaseCalibraRelation> queryall(HashMap parmas) {
         return dynamicBaseBatchStationMapper.selectByParameters(parmas);
     }
+
+    @Override
+    public boolean enable(String id) {
+        DynamicBaseBatchStation byId = this.getById(id);
+        Assert.notNull(byId, "记录不存在");
+        if (byId.getValidFlag().equals("1")) return false;
+        DynamicBaseBatchStation config = new DynamicBaseBatchStation();
+        config.setStationNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseBatchStationMapper.enable(config) == 1;
+    }
+
+    @Override
+    public boolean disable(String id) {
+        DynamicBaseBatchStation byId = this.getById(id);
+        if (byId.getValidFlag() == "0") return false;
+        DynamicBaseBatchStation config = new DynamicBaseBatchStation();
+        config.setStationNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseBatchStationMapper.disable(config) == 1;
+    }
+
+    private void setUpdateManInfo(DynamicBaseBatchStation config) {
+        config.setUpdateManNo(UserUtil.getCurrentUserId());
+        config.setUpdateManName(UserUtil.getCurrentUserName());
+        config.setUpdateTime(new Date());
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasecamera/controller/DynamicBaseCameraController.java

@@ -1,8 +1,12 @@
 package com.jisco.dynamicweight.dynamicbasecamera.controller;
 
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
 import com.jisco.dynamicweight.dynamicbasecamera.model.DynamicBaseCamera;
 import com.jisco.dynamicweight.dynamicbasecamera.service.IDynamicBaseCameraService;
 import com.jisco.dynamicweight.dynamicbasecamera.service.IFLVService;
+import com.jisco.dynamicweight.util.ExcelUtil;
+import com.jisco.dynamicweight.util.UserUtil;
 import com.jisco.dynamicweight.util.VideoUtil;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -11,24 +15,23 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.bytedeco.javacv.FFmpegFrameGrabber;
-import org.bytedeco.javacv.Frame;
-import org.bytedeco.javacv.Java2DFrameConverter;
+import org.bytedeco.javacv.*;
+import org.bytedeco.opencv.opencv_core.IplImage;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import sun.misc.BASE64Encoder;
-import java.util.Date;
 
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.nio.Buffer;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -75,7 +78,6 @@ public class DynamicBaseCameraController extends BaseRESTfulController {
     //@RequiresPermissions("dynamicbasecamera:view")
     @GetMapping(value = "/like/")
     public RESTfulResult listLike(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-
         PageList<DynamicBaseCamera> list = dynamicBaseCameraService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
@@ -85,17 +87,20 @@ public class DynamicBaseCameraController extends BaseRESTfulController {
     //@RequiresPermissions("dynamicbasecamera:create")
     @PostMapping(value = "/")
     public RESTfulResult add(@RequestBody DynamicBaseCamera model) {
-//        UserPayload payload = UserPayload.getCurrUser();
-//        String userId = payload.getId();
-//        String userName = payload.getUserName();
-//        model.setCreateManNo(userId);
-//        model.setCreateManName(userName);
-
+        model.setCreateManNo(UserUtil.getCurrentUserId());
+        model.setCreateManName(UserUtil.getCurrentUserName());
         model.setCreateTime(new Date());
         DynamicBaseCamera dynamicBaseCamera = dynamicBaseCameraService.add(model);
         return success(dynamicBaseCamera);
     }
 
+    @ApiOperation(value = "导出Excel", notes = "导出Excel")
+    @PostMapping(value = "/exportExcel")//String
+    public void exportExcel(HttpServletResponse response) throws IOException {
+        List<DynamicBaseCamera> list = dynamicBaseCameraService.query(null);
+        ExcelUtil.exportExcel(response, list, DynamicBaseCamera.class, "动态秤站点视频配置");
+    }
+
     @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("dynamicbasecamera:view")
@@ -114,6 +119,9 @@ public class DynamicBaseCameraController extends BaseRESTfulController {
     @PutMapping(value = "/{id}", produces = "application/json;charset=UTF-8")
     public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseCamera model) {
         model.setId(id);
+        model.setUpdateManNo(UserUtil.getCurrentUserId());
+        model.setUpdateManName(UserUtil.getCurrentUserName());
+        model.setUpdateTime(new Date());
         DynamicBaseCamera dynamicBaseCamera = dynamicBaseCameraService.modify(model);
         return success(dynamicBaseCamera);
     }
@@ -132,8 +140,8 @@ public class DynamicBaseCameraController extends BaseRESTfulController {
     }
 
     //无需nginx推流服务器，本身服务器够强就行，切可以集群部署
-    @GetMapping(value = "/video/flv/live/{id}", produces = {"video/x-flv;charset=UTF-8"})
-    public void flvLive(@PathVariable(value = "id") String id, HttpServletResponse response,
+    @GetMapping(value = "/video/flv/live/", produces = {"video/x-flv;charset=UTF-8"})
+    public void flvLive(@RequestParam(value = "id") String id, @RequestParam(value = "verificationCode") String verificationCode, HttpServletResponse response,
                         HttpServletRequest request) {
         DynamicBaseCamera camera = dynamicBaseCameraService.getById(id);
         String url = VideoUtil.getRTSPUrl(camera);
@@ -148,7 +156,7 @@ public class DynamicBaseCameraController extends BaseRESTfulController {
         }
 
         //非网关时开启这里，flvjs插件播放
-        // response.setHeader("Access-Control-Allow-Origin", "*");//走网关时去掉这行
+        response.setHeader("Access-Control-Allow-Origin", "*");//走网关时去掉这行
         flvService.open(url, id, response, request);
     }
 
@@ -164,36 +172,21 @@ public class DynamicBaseCameraController extends BaseRESTfulController {
     public RESTfulResult shot(@RequestParam String id) throws IOException, InterruptedException {
 //        long start = System.currentTimeMillis();
         DynamicBaseCamera camera = dynamicBaseCameraService.getById(id);
+        if (Objects.isNull(camera)) return failed(null, "未查询到摄像头配置信息");
         String url = VideoUtil.getRTSPUrl(camera);
         FFmpegFrameGrabber fFmpegFrameGrabber = new FFmpegFrameGrabber(url);
         fFmpegFrameGrabber.start();
         fFmpegFrameGrabber.getAudioChannels();
-        TimeUnit.MILLISECONDS.sleep(500);
         Frame frame = fFmpegFrameGrabber.grabImage();
-//        long end = System.currentTimeMillis();
-//        System.err.println("截图：" + (end - start));
-//        start = end;
         Java2DFrameConverter java2DFrameConverter = new Java2DFrameConverter();
         BufferedImage bufferedImage = java2DFrameConverter.convert(frame);
-//        end = System.currentTimeMillis();
-//        System.err.println("bufferedImage：" + (end - start));
-//        start = end;
-        //测试将jpg图片写入磁盘中
-//        File output = new File("D:\\test.jpg");
-//        ImageIO.write(bufferedImage,"jpg", output);
+        fFmpegFrameGrabber.stop();
         ByteArrayOutputStream baos = new ByteArrayOutputStream();//io流
-        ImageIO.write(bufferedImage, "jpg", baos);//写入流中
+        ImageIO.write(bufferedImage, "jpeg", baos);//写入流中
         byte[] bytes = baos.toByteArray();//转换成字节
-//        end = System.currentTimeMillis();
-//        System.err.println("bytes：" + (end - start));
-//        start = end;
         BASE64Encoder encoder = new BASE64Encoder();
         String jpg_base64 = encoder.encodeBuffer(bytes).trim();//转换成base64串
         jpg_base64 = jpg_base64.replaceAll("\n", "").replaceAll("\r", "");//删除 \r\n
-//        end = System.currentTimeMillis();
-//        System.err.println("jpg_base64：" + (end - start));
-//        start = end;
-//        ImageIO.write(bufferedImage, "jpg", new File("D:/qrcode1.jpg"));
-        return success("data:image/jpg;base64," + jpg_base64);
+        return success("data:image/jpeg;base64," + jpg_base64);
     }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasematerial/controller/DynamicBaseMaterialController.java

@@ -47,7 +47,7 @@ public class DynamicBaseMaterialController extends BaseRESTfulController {
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
         @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
-    //@RequiresPermissions("dynamicbasemeterial:view")
+    //@RequiresPermissions("dynamicbasematerial:view")
     @GetMapping(value = "/")
     public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
         PageList<DynamicBaseMaterial> list = dynamicBaseMaterialService.queryForPage(parmas, pageNum, pageSize);
@@ -59,7 +59,7 @@ public class DynamicBaseMaterialController extends BaseRESTfulController {
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
         @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
-    //@RequiresPermissions("dynamicbasemeterial:view")
+    //@RequiresPermissions("dynamicbasematerial:view")
     @GetMapping(value = "/like/")
     public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
         PageList<DynamicBaseMaterial> list = dynamicBaseMaterialService.queryLikeForPage(parmas, pageNum, pageSize);
@@ -68,15 +68,15 @@ public class DynamicBaseMaterialController extends BaseRESTfulController {
     
     @ApiOperation(value="创建", notes="根据DynamicBaseMaterial对象创建")
     @ApiImplicitParam(name = "dynamicBaseMaterial", value = "详细实体dynamicBaseMaterial", required = true, dataType = "DynamicBaseMaterial")
-    //@RequiresPermissions("dynamicbasemeterial:create")
+    //@RequiresPermissions("dynamicbasematerial:create")
     @PostMapping(value = "/")
     public RESTfulResult add(@RequestBody DynamicBaseMaterial model){
-        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入物料名称!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialCode()), "请输入物料编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入数采物料名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialCode()), "请输皮卡物料编码!");
         Assert.isTrue(StringUtils.isNotBlank(model.getPikaMaterialName()), "请输入皮卡系统物料名称!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
-        Assert.isTrue(Objects.nonNull(model.getIsReturnedDust()), "请选择是否返粉!");
-        Assert.isTrue(Objects.nonNull(model.getIsCoke()), "请选择是否是焦炭!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
+//        Assert.isTrue(Objects.nonNull(model.getIsReturnedDust()), "请选择是否返粉!");
+//        Assert.isTrue(Objects.nonNull(model.getIsCoke()), "请选择是否是焦炭!");
         model.setCreateManNo(UserUtil.getCurrentUserId());
         model.setCreateManName(UserUtil.getCurrentUserName());
         model.setCreateTime(new Date());
@@ -86,7 +86,7 @@ public class DynamicBaseMaterialController extends BaseRESTfulController {
 
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("dynamicbasemeterial:view")
+    //@RequiresPermissions("dynamicbasematerial:view")
     @GetMapping(value = "/{id}")
     public RESTfulResult get(@PathVariable String id){
         DynamicBaseMaterial dynamicBaseMaterial = dynamicBaseMaterialService.getById(id);
@@ -98,15 +98,15 @@ public class DynamicBaseMaterialController extends BaseRESTfulController {
         @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
         @ApiImplicitParam(name = "dynamicBaseMaterial", value = "详细实体dynamicBaseMaterial", required = true, dataType = "DynamicBaseMaterial")
     })
-    //@RequiresPermissions("dynamicbasemeterial:update")
+    //@RequiresPermissions("dynamicbasematerial:update")
     @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
     public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseMaterial model){
-        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入物料名称!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialCode()), "请输入物料编码!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入数采物料名称!");
+        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialCode()), "请输皮卡物料编码!");
         Assert.isTrue(StringUtils.isNotBlank(model.getPikaMaterialName()), "请输入皮卡系统物料名称!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
-        Assert.isTrue(Objects.nonNull(model.getIsReturnedDust()), "请选择是否返粉!");
-        Assert.isTrue(Objects.nonNull(model.getIsCoke()), "请选择是否是焦炭!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
+//        Assert.isTrue(Objects.nonNull(model.getIsReturnedDust()), "请选择是否返粉!");
+//        Assert.isTrue(Objects.nonNull(model.getIsCoke()), "请选择是否是焦炭!");
         model.setId(id);
         model.setUpdateManNo(UserUtil.getCurrentUserId());
         model.setUpdateManName(UserUtil.getCurrentUserName());
@@ -117,7 +117,7 @@ public class DynamicBaseMaterialController extends BaseRESTfulController {
 
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("dynamicbasemeterial:delete")
+    //@RequiresPermissions("dynamicbasematerial:delete")
     @DeleteMapping(value = "/{id}")//String
     public RESTfulResult delete(@PathVariable String id){
     	List<String> list = Arrays.asList(id.split(","));
@@ -146,4 +146,20 @@ public class DynamicBaseMaterialController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "启用", notes = "启用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/enable/{id}")
+    public RESTfulResult enable(@PathVariable String id) {
+        boolean flag = dynamicBaseMaterialService.enable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
+
+    @ApiOperation(value = "禁用", notes = "禁用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/disable/{id}")
+    public RESTfulResult disable(@PathVariable String id) {
+        boolean flag = dynamicBaseMaterialService.disable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasematerial/mapper/DynamicBaseMaterialMapper.java

@@ -6,4 +6,17 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface DynamicBaseMaterialMapper extends IBaseMapper<DynamicBaseMaterial, String> {
+    /**
+     * 启用
+     * @param config
+     * @return
+     */
+    int enable(DynamicBaseMaterial config);
+
+    /**
+     * 禁用
+     * @param config
+     * @return
+     */
+    int disable(DynamicBaseMaterial config);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasematerial/mapper/DynamicBaseMaterialMapper.xml

@@ -18,7 +18,7 @@
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="columns">
-    MATERIAL_NO, MATERIAL_NAME, MATERIAL_CODE, PIKA_MATERIAL_NAME, IS_RETURNED_DUST, 
+    MATERIAL_NO, MATERIAL_NAME, MATERIAL_CODE, PIKA_MATERIAL_NAME, IS_RETURNED_DUST,
     IS_COKE, MEMO, VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
     UPDATE_MAN_NAME, UPDATE_TIME
   </sql>
@@ -440,5 +440,23 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <!--启用-->
+  <update id="enable" parameterType="com.jisco.dynamicweight.dynamicbasematerial.model.DynamicBaseMaterial">
+    update DYNAMIC_BASE_MATERIAL
+    set valid_flag    = '1',
+        update_man_no = #{updateManNo},
+        update_man_name = #{updateManName},
+        update_time = #{updateTime}
+    where MATERIAL_NO = #{id}
+  </update>
+  <!--禁用-->
+  <update id="disable"
+          parameterType="com.jisco.dynamicweight.dynamicbasematerial.model.DynamicBaseMaterial">
+    update DYNAMIC_BASE_MATERIAL
+    set valid_flag = '0',
+        update_man_no = #{updateManNo},
+        update_man_name = #{updateManName},
+        update_time = #{updateTime}
+    where MATERIAL_NO = #{id}
+  </update>
 </mapper>

src/main/java/com/jisco/dynamicweight/dynamicbasematerial/model/DynamicBaseMaterial.java

@@ -10,25 +10,25 @@ import java.util.Date;
 @ApiModel(value="动态秤物料表")
 public class DynamicBaseMaterial implements IBasePO<String> {
     /**
-     * ID(Material_NO,VARCHAR,20)
+     * ID(MATERIAL_NO,VARCHAR,20)
      */
     @ApiModelProperty(value="ID",required=true)
     private String materialNo;
 
     /**
-     * 物料名称(Material_NAME,VARCHAR,60)
+     * 物料名称(MATERIAL_NAME,VARCHAR,60)
      */
     @ApiModelProperty(value="物料名称",required=false)
     private String materialName;
 
     /**
-     * 物料编码(Material_CODE,VARCHAR,60)
+     * 物料编码(MATERIAL_CODE,VARCHAR,60)
      */
     @ApiModelProperty(value="物料编码",required=false)
     private String materialCode;
 
     /**
-     * PIKA物料名称(PIKA_Material_NAME,VARCHAR,60)
+     * PIKA物料名称(PIKA_MATERIAL_NAME,VARCHAR,60)
      */
     @ApiModelProperty(value="PIKA物料名称",required=false)
     private String pikaMaterialName;

src/main/java/com/jisco/dynamicweight/dynamicbasematerial/service/IDynamicBaseMaterialService.java

@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 
 /**
- * DynamicBaseMeterial服务接口：
+ * DynamicBaseMaterial服务接口：
  * @author generator
  * @version 1.0-SNAPSHORT 2022-01-19 04:34
  * 类描述
@@ -16,11 +16,26 @@ import java.util.List;
  * 日期：2022-01-19
  * 作者：generator
  * 参考：
- * 描述：DynamicBaseMeterial服务接口
+ * 描述：DynamicBaseMaterial服务接口
  * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IDynamicBaseMaterialService extends IBaseService<DynamicBaseMaterial, String>{
 
     List<MeterBaseCalibraRelation> queryall(HashMap parmas);
+
+    /**
+     * 启用
+     * @param id
+     * @return
+     */
+    boolean disable(String id);
+
+
+    /**
+     * 禁用
+     * @param id
+     * @return
+     */
+    boolean enable(String id);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasematerial/service/impl/DynamicBaseMaterialServiceImpl.java

@@ -1,19 +1,22 @@
 package com.jisco.dynamicweight.dynamicbasematerial.service.impl;
 
+import cn.hutool.core.lang.Assert;
 import com.jisco.dynamicweight.dynamicbasematerial.mapper.DynamicBaseMaterialMapper;
 import com.jisco.dynamicweight.dynamicbasematerial.model.DynamicBaseMaterial;
 import com.jisco.dynamicweight.dynamicbasematerial.service.IDynamicBaseMaterialService;
+import com.jisco.dynamicweight.util.UserUtil;
 import com.steerinfo.baseinfo.meterbasecalibrarelation.model.MeterBaseCalibraRelation;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
 /**
- * DynamicBaseMeterial服务实现：
+ * DynamicBaseMaterial服务实现：
  * @author generator
  * @version 1.0-SNAPSHORT 2022-01-19 04:34
  * 类描述
@@ -21,7 +24,7 @@ import java.util.List;
  * 日期：2022-01-19
  * 作者：generator
  * 参考：
- * 描述：DynamicBaseMeterial服务实现
+ * 描述：DynamicBaseMaterial服务实现
  * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
@@ -40,4 +43,41 @@ public class DynamicBaseMaterialServiceImpl extends BaseServiceImpl<DynamicBaseM
     public List<MeterBaseCalibraRelation> queryall(HashMap parmas) {
         return dynamicBaseMaterialMapper.selectByParameters(parmas);
     }
+
+    /**
+     * 启用
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean enable(String id) {
+        DynamicBaseMaterial byId = this.getById(id);
+        Assert.notNull(byId, "记录不存在");
+        if (byId.getValidFlag().equals("1")) return false;
+        DynamicBaseMaterial config = new DynamicBaseMaterial();
+        config.setMaterialNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseMaterialMapper.enable(config) == 1;
+    }
+
+    /**
+     * 禁用
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean disable(String id) {
+        DynamicBaseMaterial byId = this.getById(id);
+        if (byId.getValidFlag() == "0") return false;
+        DynamicBaseMaterial config = new DynamicBaseMaterial();
+        config.setMaterialNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseMaterialMapper.disable(config) == 1;
+    }
+
+    private void setUpdateManInfo(DynamicBaseMaterial config) {
+        config.setUpdateManNo(UserUtil.getCurrentUserId());
+        config.setUpdateManName(UserUtil.getCurrentUserName());
+        config.setUpdateTime(new Date());
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasereciever/controller/DynamicBaseRecieverController.java

@@ -149,4 +149,21 @@ public class DynamicBaseRecieverController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+
+    @ApiOperation(value = "启用", notes = "启用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/enable/{id}")
+    public RESTfulResult enable(@PathVariable String id) {
+        boolean flag = dynamicBaseRecieverService.enable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
+
+    @ApiOperation(value = "禁用", notes = "禁用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/disable/{id}")
+    public RESTfulResult disable(@PathVariable String id) {
+        boolean flag = dynamicBaseRecieverService.disable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasereciever/mapper/DynamicBaseRecieverMapper.java

@@ -1,9 +1,23 @@
 package com.jisco.dynamicweight.dynamicbasereciever.mapper;
 
 import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
+import com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface DynamicBaseRecieverMapper extends IBaseMapper<DynamicBaseReciever, String> {
+    /**
+     * 启用
+     * @param config
+     * @return
+     */
+    int enable(DynamicBaseReciever config);
+
+    /**
+     * 禁用
+     * @param config
+     * @return
+     */
+    int disable(DynamicBaseReciever config);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasereciever/mapper/DynamicBaseRecieverMapper.xml

@@ -415,5 +415,23 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <!--启用-->
+  <update id="enable" parameterType="com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever">
+    update DYNAMIC_BASE_RECIEVER
+    set valid_flag    = '1',
+        update_man_no = #{updateManNo},
+        update_man_name = #{updateManName},
+        update_time = #{updateTime}
+    where RECEIVER_NO = #{id}
+  </update>
+  <!--禁用-->
+  <update id="disable"
+          parameterType="com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever">
+    update DYNAMIC_BASE_RECIEVER
+    set valid_flag = '0',
+        update_man_no = #{updateManNo},
+        update_man_name = #{updateManName},
+        update_time = #{updateTime}
+    where RECEIVER_NO = #{id}
+  </update>
 </mapper>

src/main/java/com/jisco/dynamicweight/dynamicbasereciever/service/IDynamicBaseRecieverService.java

@@ -23,4 +23,19 @@ import java.util.List;
 public interface IDynamicBaseRecieverService extends IBaseService<DynamicBaseReciever, String>{
 
     List<MeterBaseCalibraRelation> queryall(HashMap parmas);
+
+    /**
+     * 启用
+     * @param id
+     * @return
+     */
+    boolean disable(String id);
+
+
+    /**
+     * 禁用
+     * @param id
+     * @return
+     */
+    boolean enable(String id);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasereciever/service/impl/DynamicBaseRecieverServiceImpl.java

@@ -1,14 +1,18 @@
 package com.jisco.dynamicweight.dynamicbasereciever.service.impl;
 
+import cn.hutool.core.lang.Assert;
 import com.jisco.dynamicweight.dynamicbasereciever.mapper.DynamicBaseRecieverMapper;
 import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
 import com.jisco.dynamicweight.dynamicbasereciever.service.IDynamicBaseRecieverService;
+import com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender;
+import com.jisco.dynamicweight.util.UserUtil;
 import com.steerinfo.baseinfo.meterbasecalibrarelation.model.MeterBaseCalibraRelation;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -40,4 +44,40 @@ public class DynamicBaseRecieverServiceImpl extends BaseServiceImpl<DynamicBaseR
     public List<MeterBaseCalibraRelation> queryall(HashMap parmas) {
         return dynamicBaseRecieverMapper.selectByParameters(parmas);
     }
+    /**
+     * 启用
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean enable(String id) {
+        DynamicBaseReciever byId = this.getById(id);
+        Assert.notNull(byId, "记录不存在");
+        if (byId.getValidFlag().equals("1")) return false;
+        DynamicBaseReciever config = new DynamicBaseReciever();
+        config.setReceiverNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseRecieverMapper.enable(config) == 1;
+    }
+
+    /**
+     * 禁用
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean disable(String id) {
+        DynamicBaseReciever byId = this.getById(id);
+        if (byId.getValidFlag() == "0") return false;
+        DynamicBaseReciever config = new DynamicBaseReciever();
+        config.setReceiverNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseRecieverMapper.disable(config) == 1;
+    }
+
+    private void setUpdateManInfo(DynamicBaseReciever config) {
+        config.setUpdateManNo(UserUtil.getCurrentUserId());
+        config.setUpdateManName(UserUtil.getCurrentUserName());
+        config.setUpdateTime(new Date());
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasescstation/controller/DynamicBaseScStationController.java

@@ -76,13 +76,16 @@ public class DynamicBaseScStationController extends BaseRESTfulController {
         Assert.isTrue(StringUtils.isNotBlank(model.getName()), "请输入皮带秤名称!");
         Assert.isTrue(StringUtils.isNotBlank(model.getStationNum()), "请输入数采系统站点编码!");
         Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入物料名称!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getSenderCode()), "请输入发货库房编码!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getSenderCode()), "请输入发货库房编码!");
         Assert.isTrue(StringUtils.isNotBlank(model.getSenderName()), "请输入发货库房!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getSenderType()), "请输入发货点类型!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverCode()), "请输入收货库房编码!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getSenderType()), "请输入发货点类型!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverCode()), "请输入收货库房编码!");
         Assert.isTrue(StringUtils.isNotBlank(model.getRecieverName()), "请输入收货库房!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverType()), "请输入收货点类型!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverType()), "请输入收货点类型!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
+//        Assert.notNull(model.getIsUpload(), "是否上传皮卡不能为空!");
+//        Assert.notNull(model.getIsInbatches(), "是否分批不能为空!");
+        model.setValidFlag("1");
         model.setCreateManNo(UserUtil.getCurrentUserId());
         model.setCreateManName(UserUtil.getCurrentUserName());
         model.setCreateTime(new Date());
@@ -110,13 +113,13 @@ public class DynamicBaseScStationController extends BaseRESTfulController {
         Assert.isTrue(StringUtils.isNotBlank(model.getName()), "请输入皮带秤名称!");
         Assert.isTrue(StringUtils.isNotBlank(model.getStationNum()), "请输入数采系统站点编码!");
         Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入物料名称!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getSenderCode()), "请输入发货库房编码!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getSenderCode()), "请输入发货库房编码!");
         Assert.isTrue(StringUtils.isNotBlank(model.getSenderName()), "请输入发货库房!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getSenderType()), "请输入发货点类型!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverCode()), "请输入收货库房编码!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getSenderType()), "请输入发货点类型!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverCode()), "请输入收货库房编码!");
         Assert.isTrue(StringUtils.isNotBlank(model.getRecieverName()), "请输入收货库房!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverType()), "请输入收货点类型!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getRecieverType()), "请输入收货点类型!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
         model.setId(id);
         model.setUpdateManNo(UserUtil.getCurrentUserId());
         model.setUpdateManName(UserUtil.getCurrentUserName());
@@ -144,4 +147,20 @@ public class DynamicBaseScStationController extends BaseRESTfulController {
         List<DynamicBaseScStation> list = dynamicBaseScStationService.query(null);
         ExcelUtil.exportExcel(response, list, DynamicBaseScStation.class, "动态秤日报站点信息");
     }
+
+    @ApiOperation(value = "启用", notes = "启用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/enable/{id}")
+    public RESTfulResult enable(@PathVariable String id) {
+        boolean flag = dynamicBaseScStationService.enable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
+
+    @ApiOperation(value = "禁用", notes = "禁用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/disable/{id}")
+    public RESTfulResult disable(@PathVariable String id) {
+        boolean flag = dynamicBaseScStationService.disable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasescstation/mapper/DynamicBaseScStationMapper.java

@@ -1,9 +1,23 @@
 package com.jisco.dynamicweight.dynamicbasescstation.mapper;
 
+import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
 import com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface DynamicBaseScStationMapper extends IBaseMapper<DynamicBaseScStation, String> {
+    /**
+     * 启用
+     * @param config
+     * @return
+     */
+    int enable(DynamicBaseScStation config);
+
+    /**
+     * 禁用
+     * @param config
+     * @return
+     */
+    int disable(DynamicBaseScStation config);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasescstation/mapper/DynamicBaseScStationMapper.xml

@@ -1,575 +1,633 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jisco.dynamicweight.dynamicbasescstation.mapper.DynamicBaseScStationMapper">
-  <resultMap id="BaseResultMap" type="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
-    <id column="STATION_NO" jdbcType="VARCHAR" property="stationNo" />
-    <result column="NAME" jdbcType="VARCHAR" property="name" />
-    <result column="STATION_NUM" jdbcType="VARCHAR" property="stationNum" />
-    <result column="MATERIAL_CODE" jdbcType="VARCHAR" property="materialCode" />
-    <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName" />
-    <result column="SENDER_CODE" jdbcType="VARCHAR" property="senderCode" />
-    <result column="SENDER_NAME" jdbcType="VARCHAR" property="senderName" />
-    <result column="SENDER_TYPE" jdbcType="VARCHAR" property="senderType" />
-    <result column="RECIEVER_CODE" jdbcType="VARCHAR" property="recieverCode" />
-    <result column="RECIEVER_NAME" jdbcType="VARCHAR" property="recieverName" />
-    <result column="RECIEVER_TYPE" jdbcType="VARCHAR" property="recieverType" />
-    <result column="IS_UPLOAD" jdbcType="DECIMAL" property="isUpload" />
-    <result column="IS_INBATCHES" jdbcType="DECIMAL" property="isInbatches" />
-    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
-    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
-    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
-    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
-    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
-    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="columns">
-    STATION_NO, NAME, STATION_NUM, MATERIAL_CODE, MATERIAL_NAME, SENDER_CODE, SENDER_NAME, 
+    <resultMap id="BaseResultMap" type="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+        <id column="STATION_NO" jdbcType="VARCHAR" property="stationNo"/>
+        <result column="NAME" jdbcType="VARCHAR" property="name"/>
+        <result column="STATION_NUM" jdbcType="VARCHAR" property="stationNum"/>
+        <result column="MATERIAL_CODE" jdbcType="VARCHAR" property="materialCode"/>
+        <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName"/>
+        <result column="SENDER_CODE" jdbcType="VARCHAR" property="senderCode"/>
+        <result column="SENDER_NAME" jdbcType="VARCHAR" property="senderName"/>
+        <result column="SENDER_TYPE" jdbcType="VARCHAR" property="senderType"/>
+        <result column="RECIEVER_CODE" jdbcType="VARCHAR" property="recieverCode"/>
+        <result column="RECIEVER_NAME" jdbcType="VARCHAR" property="recieverName"/>
+        <result column="RECIEVER_TYPE" jdbcType="VARCHAR" property="recieverType"/>
+        <result column="IS_UPLOAD" jdbcType="DECIMAL" property="isUpload"/>
+        <result column="IS_INBATCHES" jdbcType="DECIMAL" property="isInbatches"/>
+        <result column="MEMO" jdbcType="VARCHAR" property="memo"/>
+        <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag"/>
+        <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo"/>
+        <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName"/>
+        <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo"/>
+        <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+    </resultMap>
+    <sql id="columns">
+        STATION_NO
+        , NAME, STATION_NUM, MATERIAL_CODE, MATERIAL_NAME, SENDER_CODE, SENDER_NAME,
     SENDER_TYPE, RECIEVER_CODE, RECIEVER_NAME, RECIEVER_TYPE, MEMO, VALID_FLAG, CREATE_MAN_NO, 
-    CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
-  </sql>
-  <sql id="columns_alias">
-    t.STATION_NO, t.NAME, t.STATION_NUM, t.MATERIAL_CODE, t.MATERIAL_NAME, t.SENDER_CODE, 
+    CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,IS_UPLOAD,IS_INBATCHES
+    </sql>
+    <sql id="columns_alias">
+        t.STATION_NO, t.NAME, t.STATION_NUM, t.MATERIAL_CODE, t.MATERIAL_NAME, t.SENDER_CODE,
     t.SENDER_NAME, t.SENDER_TYPE, t.RECIEVER_CODE, t.RECIEVER_NAME, t.RECIEVER_TYPE, 
     t.MEMO, t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, 
-    t.UPDATE_MAN_NAME, t.UPDATE_TIME
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM DYNAMIC_BASE_SC_STATION
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM DYNAMIC_BASE_SC_STATION t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="stationNo != null and stationNo != ''">
-        and STATION_NO = #{stationNo}
-      </if>
-      <if test="name != null and name != ''">
-        and NAME = #{name}
-      </if>
-      <if test="stationNum != null and stationNum != ''">
-        and STATION_NUM = #{stationNum}
-      </if>
-      <if test="materialCode != null and materialCode != ''">
-        and MATERIAL_CODE = #{materialCode}
-      </if>
-      <if test="materialName != null and materialName != ''">
-        and MATERIAL_NAME = #{materialName}
-      </if>
-      <if test="senderCode != null and senderCode != ''">
-        and SENDER_CODE = #{senderCode}
-      </if>
-      <if test="senderName != null and senderName != ''">
-        and SENDER_NAME = #{senderName}
-      </if>
-      <if test="senderType != null and senderType != ''">
-        and SENDER_TYPE = #{senderType}
-      </if>
-      <if test="recieverCode != null and recieverCode != ''">
-        and RECIEVER_CODE = #{recieverCode}
-      </if>
-      <if test="recieverName != null and recieverName != ''">
-        and RECIEVER_NAME = #{recieverName}
-      </if>
-      <if test="recieverType != null and recieverType != ''">
-        and RECIEVER_TYPE = #{recieverType}
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO = #{memo}
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        and VALID_FLAG = #{validFlag}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        and CREATE_MAN_NO = #{createManNo}
-      </if>
-      <if test="createManName != null and createManName != ''">
-        and CREATE_MAN_NAME = #{createManName}
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="stationNo != null and stationNo != ''">
-        and STATION_NO LIKE '%${stationNo}%'
-      </if>
-      <if test="name != null and name != ''">
-        and NAME LIKE '%${name}%'
-      </if>
-      <if test="stationNum != null and stationNum != ''">
-        and STATION_NUM LIKE '%${stationNum}%'
-      </if>
-      <if test="materialCode != null and materialCode != ''">
-        and MATERIAL_CODE LIKE '%${materialCode}%'
-      </if>
-      <if test="materialName != null and materialName != ''">
-        and MATERIAL_NAME LIKE '%${materialName}%'
-      </if>
-      <if test="senderCode != null and senderCode != ''">
-        and SENDER_CODE LIKE '%${senderCode}%'
-      </if>
-      <if test="senderName != null and senderName != ''">
-        and SENDER_NAME LIKE '%${senderName}%'
-      </if>
-      <if test="senderType != null and senderType != ''">
-        and SENDER_TYPE LIKE '%${senderType}%'
-      </if>
-      <if test="recieverCode != null and recieverCode != ''">
-        and RECIEVER_CODE LIKE '%${recieverCode}%'
-      </if>
-      <if test="recieverName != null and recieverName != ''">
-        and RECIEVER_NAME LIKE '%${recieverName}%'
-      </if>
-      <if test="recieverType != null and recieverType != ''">
-        and RECIEVER_TYPE LIKE '%${recieverType}%'
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO LIKE '%${memo}%'
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        and VALID_FLAG LIKE '%${validFlag}%'
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        and CREATE_MAN_NO LIKE '%${createManNo}%'
-      </if>
-      <if test="createManName != null and createManName != ''">
-        and CREATE_MAN_NAME LIKE '%${createManName}%'
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from DYNAMIC_BASE_SC_STATION
-    where STATION_NO = #{stationNo,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from DYNAMIC_BASE_SC_STATION
-    where 1!=1 
-      <if test="name != null and name != ''">
-        or NAME = #{name}
-      </if>
-      <if test="stationNum != null and stationNum != ''">
-        or STATION_NUM = #{stationNum}
-      </if>
-      <if test="materialCode != null and materialCode != ''">
-        or MATERIAL_CODE = #{materialCode}
-      </if>
-      <if test="materialName != null and materialName != ''">
-        or MATERIAL_NAME = #{materialName}
-      </if>
-      <if test="senderCode != null and senderCode != ''">
-        or SENDER_CODE = #{senderCode}
-      </if>
-      <if test="senderName != null and senderName != ''">
-        or SENDER_NAME = #{senderName}
-      </if>
-      <if test="senderType != null and senderType != ''">
-        or SENDER_TYPE = #{senderType}
-      </if>
-      <if test="recieverCode != null and recieverCode != ''">
-        or RECIEVER_CODE = #{recieverCode}
-      </if>
-      <if test="recieverName != null and recieverName != ''">
-        or RECIEVER_NAME = #{recieverName}
-      </if>
-      <if test="recieverType != null and recieverType != ''">
-        or RECIEVER_TYPE = #{recieverType}
-      </if>
-      <if test="memo != null and memo != ''">
-        or MEMO = #{memo}
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        or VALID_FLAG = #{validFlag}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        or CREATE_MAN_NO = #{createManNo}
-      </if>
-      <if test="createManName != null and createManName != ''">
-        or CREATE_MAN_NAME = #{createManName}
-      </if>
-      <if test="createTime != null">
-        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        or UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        or UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
-    insert into DYNAMIC_BASE_SC_STATION (STATION_NO, NAME, STATION_NUM, 
-      MATERIAL_CODE, MATERIAL_NAME, SENDER_CODE, 
-      SENDER_NAME, SENDER_TYPE, RECIEVER_CODE, 
-      RECIEVER_NAME, RECIEVER_TYPE, MEMO, 
-      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
-      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-      UPDATE_TIME)
-    values (#{stationNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{stationNum,jdbcType=VARCHAR}, 
-      #{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{senderCode,jdbcType=VARCHAR}, 
-      #{senderName,jdbcType=VARCHAR}, #{senderType,jdbcType=VARCHAR}, #{recieverCode,jdbcType=VARCHAR}, 
-      #{recieverName,jdbcType=VARCHAR}, #{recieverType,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
-      #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
-    insert into DYNAMIC_BASE_SC_STATION
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="stationNo != null">
-        STATION_NO,
-      </if>
-      <if test="name != null">
-        NAME,
-      </if>
-      <if test="stationNum != null">
-        STATION_NUM,
-      </if>
-      <if test="materialCode != null">
-        MATERIAL_CODE,
-      </if>
-      <if test="materialName != null">
-        MATERIAL_NAME,
-      </if>
-      <if test="senderCode != null">
-        SENDER_CODE,
-      </if>
-      <if test="senderName != null">
-        SENDER_NAME,
-      </if>
-      <if test="senderType != null">
-        SENDER_TYPE,
-      </if>
-      <if test="recieverCode != null">
-        RECIEVER_CODE,
-      </if>
-      <if test="recieverName != null">
-        RECIEVER_NAME,
-      </if>
-      <if test="recieverType != null">
-        RECIEVER_TYPE,
-      </if>
-      <if test="memo != null">
-        MEMO,
-      </if>
-      <if test="validFlag != null">
-        VALID_FLAG,
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO,
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME,
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME,
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO,
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="stationNo != null">
-        #{stationNo,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="stationNum != null">
-        #{stationNum,jdbcType=VARCHAR},
-      </if>
-      <if test="materialCode != null">
-        #{materialCode,jdbcType=VARCHAR},
-      </if>
-      <if test="materialName != null">
-        #{materialName,jdbcType=VARCHAR},
-      </if>
-      <if test="senderCode != null">
-        #{senderCode,jdbcType=VARCHAR},
-      </if>
-      <if test="senderName != null">
-        #{senderName,jdbcType=VARCHAR},
-      </if>
-      <if test="senderType != null">
-        #{senderType,jdbcType=VARCHAR},
-      </if>
-      <if test="recieverCode != null">
-        #{recieverCode,jdbcType=VARCHAR},
-      </if>
-      <if test="recieverName != null">
-        #{recieverName,jdbcType=VARCHAR},
-      </if>
-      <if test="recieverType != null">
-        #{recieverType,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="validFlag != null">
-        #{validFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="createManNo != null">
-        #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
-    update DYNAMIC_BASE_SC_STATION
-    set NAME = #{name,jdbcType=VARCHAR},
-      STATION_NUM = #{stationNum,jdbcType=VARCHAR},
-      MATERIAL_CODE = #{materialCode,jdbcType=VARCHAR},
-      MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
-      SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
-      SENDER_NAME = #{senderName,jdbcType=VARCHAR},
-      SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
-      RECIEVER_CODE = #{recieverCode,jdbcType=VARCHAR},
-      RECIEVER_NAME = #{recieverName,jdbcType=VARCHAR},
-      RECIEVER_TYPE = #{recieverType,jdbcType=VARCHAR},
-      MEMO = #{memo,jdbcType=VARCHAR},
-      VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
-      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
-    where STATION_NO = #{stationNo,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
-    update DYNAMIC_BASE_SC_STATION
-    <set>
-      <if test="name != null">
-        NAME = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="stationNum != null">
-        STATION_NUM = #{stationNum,jdbcType=VARCHAR},
-      </if>
-      <if test="materialCode != null">
-        MATERIAL_CODE = #{materialCode,jdbcType=VARCHAR},
-      </if>
-      <if test="materialName != null">
-        MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
-      </if>
-      <if test="senderCode != null">
-        SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
-      </if>
-      <if test="senderName != null">
-        SENDER_NAME = #{senderName,jdbcType=VARCHAR},
-      </if>
-      <if test="senderType != null">
-        SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
-      </if>
-      <if test="recieverCode != null">
-        RECIEVER_CODE = #{recieverCode,jdbcType=VARCHAR},
-      </if>
-      <if test="recieverName != null">
-        RECIEVER_NAME = #{recieverName,jdbcType=VARCHAR},
-      </if>
-      <if test="recieverType != null">
-        RECIEVER_TYPE = #{recieverType,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        MEMO = #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="validFlag != null">
-        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where STATION_NO = #{stationNo,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where STATION_NO = #{stationNo,jdbcType=VARCHAR}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into DYNAMIC_BASE_SC_STATION 
-      (STATION_NO, 
-      NAME, STATION_NUM, MATERIAL_CODE, 
-      MATERIAL_NAME, SENDER_CODE, SENDER_NAME, 
-      SENDER_TYPE, RECIEVER_CODE, RECIEVER_NAME, 
-      RECIEVER_TYPE, MEMO, VALID_FLAG, 
-      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.stationNo,jdbcType=VARCHAR}, 
-      #{item.name,jdbcType=VARCHAR}, #{item.stationNum,jdbcType=VARCHAR}, #{item.materialCode,jdbcType=VARCHAR}, 
-      #{item.materialName,jdbcType=VARCHAR}, #{item.senderCode,jdbcType=VARCHAR}, #{item.senderName,jdbcType=VARCHAR}, 
-      #{item.senderType,jdbcType=VARCHAR}, #{item.recieverCode,jdbcType=VARCHAR}, #{item.recieverName,jdbcType=VARCHAR}, 
-      #{item.recieverType,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, 
-      #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update DYNAMIC_BASE_SC_STATION
-     set
-       STATION_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.stationNo,jdbcType=VARCHAR}
-       </foreach>
-       ,NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.name,jdbcType=VARCHAR}
-       </foreach>
-       ,STATION_NUM=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.stationNum,jdbcType=VARCHAR}
-       </foreach>
-       ,MATERIAL_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.materialCode,jdbcType=VARCHAR}
-       </foreach>
-       ,MATERIAL_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.materialName,jdbcType=VARCHAR}
-       </foreach>
-       ,SENDER_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.senderCode,jdbcType=VARCHAR}
-       </foreach>
-       ,SENDER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.senderName,jdbcType=VARCHAR}
-       </foreach>
-       ,SENDER_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.senderType,jdbcType=VARCHAR}
-       </foreach>
-       ,RECIEVER_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.recieverCode,jdbcType=VARCHAR}
-       </foreach>
-       ,RECIEVER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.recieverName,jdbcType=VARCHAR}
-       </foreach>
-       ,RECIEVER_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.recieverType,jdbcType=VARCHAR}
-       </foreach>
-       ,MEMO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
-       </foreach>
-       ,VALID_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
-          when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-     where STATION_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.stationNo,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from DYNAMIC_BASE_SC_STATION
-    where STATION_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+    t.UPDATE_MAN_NAME, t.UPDATE_TIME,t.IS_UPLOAD,t.IS_INBATCHES
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM DYNAMIC_BASE_SC_STATION
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM DYNAMIC_BASE_SC_STATION t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="stationNo != null and stationNo != ''">
+                and STATION_NO = #{stationNo}
+            </if>
+            <if test="name != null and name != ''">
+                and NAME = #{name}
+            </if>
+            <if test="stationNum != null and stationNum != ''">
+                and STATION_NUM = #{stationNum}
+            </if>
+            <if test="materialCode != null and materialCode != ''">
+                and MATERIAL_CODE = #{materialCode}
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and MATERIAL_NAME = #{materialName}
+            </if>
+            <if test="senderCode != null and senderCode != ''">
+                and SENDER_CODE = #{senderCode}
+            </if>
+            <if test="senderName != null and senderName != ''">
+                and SENDER_NAME = #{senderName}
+            </if>
+            <if test="senderType != null and senderType != ''">
+                and SENDER_TYPE = #{senderType}
+            </if>
+            <if test="recieverCode != null and recieverCode != ''">
+                and RECIEVER_CODE = #{recieverCode}
+            </if>
+            <if test="recieverName != null and recieverName != ''">
+                and RECIEVER_NAME = #{recieverName}
+            </if>
+            <if test="recieverType != null and recieverType != ''">
+                and RECIEVER_TYPE = #{recieverType}
+            </if>
+            <if test="memo != null and memo != ''">
+                and MEMO = #{memo}
+            </if>
+            <if test="validFlag != null and validFlag != ''">
+                and VALID_FLAG = #{validFlag}
+            </if>
+            <if test="createManNo != null and createManNo != ''">
+                and CREATE_MAN_NO = #{createManNo}
+            </if>
+            <if test="createManName != null and createManName != ''">
+                and CREATE_MAN_NAME = #{createManName}
+            </if>
+            <if test="createTime != null">
+                and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+            </if>
+            <if test="updateManNo != null and updateManNo != ''">
+                and UPDATE_MAN_NO = #{updateManNo}
+            </if>
+            <if test="updateManName != null and updateManName != ''">
+                and UPDATE_MAN_NAME = #{updateManName}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="stationNo != null and stationNo != ''">
+                and STATION_NO LIKE '%${stationNo}%'
+            </if>
+            <if test="name != null and name != ''">
+                and NAME LIKE '%${name}%'
+            </if>
+            <if test="stationNum != null and stationNum != ''">
+                and STATION_NUM LIKE '%${stationNum}%'
+            </if>
+            <if test="materialCode != null and materialCode != ''">
+                and MATERIAL_CODE LIKE '%${materialCode}%'
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and MATERIAL_NAME LIKE '%${materialName}%'
+            </if>
+            <if test="senderCode != null and senderCode != ''">
+                and SENDER_CODE LIKE '%${senderCode}%'
+            </if>
+            <if test="senderName != null and senderName != ''">
+                and SENDER_NAME LIKE '%${senderName}%'
+            </if>
+            <if test="senderType != null and senderType != ''">
+                and SENDER_TYPE LIKE '%${senderType}%'
+            </if>
+            <if test="recieverCode != null and recieverCode != ''">
+                and RECIEVER_CODE LIKE '%${recieverCode}%'
+            </if>
+            <if test="recieverName != null and recieverName != ''">
+                and RECIEVER_NAME LIKE '%${recieverName}%'
+            </if>
+            <if test="recieverType != null and recieverType != ''">
+                and RECIEVER_TYPE LIKE '%${recieverType}%'
+            </if>
+            <if test="memo != null and memo != ''">
+                and MEMO LIKE '%${memo}%'
+            </if>
+            <if test="validFlag != null and validFlag != ''">
+                and VALID_FLAG LIKE '%${validFlag}%'
+            </if>
+            <if test="createManNo != null and createManNo != ''">
+                and CREATE_MAN_NO LIKE '%${createManNo}%'
+            </if>
+            <if test="createManName != null and createManName != ''">
+                and CREATE_MAN_NAME LIKE '%${createManName}%'
+            </if>
+            <if test="createTime != null">
+                and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+            </if>
+            <if test="updateManNo != null and updateManNo != ''">
+                and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+            </if>
+            <if test="updateManName != null and updateManName != ''">
+                and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+        delete
+        from DYNAMIC_BASE_SC_STATION
+        where STATION_NO = #{stationNo,jdbcType=VARCHAR}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from DYNAMIC_BASE_SC_STATION
+        where 1!=1
+        <if test="name != null and name != ''">
+            or NAME = #{name}
+        </if>
+        <if test="stationNum != null and stationNum != ''">
+            or STATION_NUM = #{stationNum}
+        </if>
+        <if test="materialCode != null and materialCode != ''">
+            or MATERIAL_CODE = #{materialCode}
+        </if>
+        <if test="materialName != null and materialName != ''">
+            or MATERIAL_NAME = #{materialName}
+        </if>
+        <if test="senderCode != null and senderCode != ''">
+            or SENDER_CODE = #{senderCode}
+        </if>
+        <if test="senderName != null and senderName != ''">
+            or SENDER_NAME = #{senderName}
+        </if>
+        <if test="senderType != null and senderType != ''">
+            or SENDER_TYPE = #{senderType}
+        </if>
+        <if test="recieverCode != null and recieverCode != ''">
+            or RECIEVER_CODE = #{recieverCode}
+        </if>
+        <if test="recieverName != null and recieverName != ''">
+            or RECIEVER_NAME = #{recieverName}
+        </if>
+        <if test="recieverType != null and recieverType != ''">
+            or RECIEVER_TYPE = #{recieverType}
+        </if>
+        <if test="memo != null and memo != ''">
+            or MEMO = #{memo}
+        </if>
+        <if test="validFlag != null and validFlag != ''">
+            or VALID_FLAG = #{validFlag}
+        </if>
+        <if test="createManNo != null and createManNo != ''">
+            or CREATE_MAN_NO = #{createManNo}
+        </if>
+        <if test="createManName != null and createManName != ''">
+            or CREATE_MAN_NAME = #{createManName}
+        </if>
+        <if test="createTime != null">
+            or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+        </if>
+        <if test="updateManNo != null and updateManNo != ''">
+            or UPDATE_MAN_NO = #{updateManNo}
+        </if>
+        <if test="updateManName != null and updateManName != ''">
+            or UPDATE_MAN_NAME = #{updateManName}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+        insert into DYNAMIC_BASE_SC_STATION (STATION_NO, NAME, STATION_NUM,
+                                             MATERIAL_CODE, MATERIAL_NAME, SENDER_CODE,
+                                             SENDER_NAME, SENDER_TYPE, RECIEVER_CODE,
+                                             RECIEVER_NAME, RECIEVER_TYPE, MEMO,
+                                             VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME,
+                                             CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME,
+                                             UPDATE_TIME, IS_UPLOAD, IS_INBATCHES)
+        values (#{stationNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{stationNum,jdbcType=VARCHAR},
+                #{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{senderCode,jdbcType=VARCHAR},
+                #{senderName,jdbcType=VARCHAR}, #{senderType,jdbcType=VARCHAR}, #{recieverCode,jdbcType=VARCHAR},
+                #{recieverName,jdbcType=VARCHAR}, #{recieverType,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR},
+                #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR},
+                #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{isUpload,jdbcType=VARCHAR}, #{isInbatches,jdbcType=VARCHAR})
+    </insert>
+    <insert id="insertSelective"
+            parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+        insert into DYNAMIC_BASE_SC_STATION
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationNo != null">
+                STATION_NO,
+            </if>
+            <if test="name != null">
+                NAME,
+            </if>
+            <if test="stationNum != null">
+                STATION_NUM,
+            </if>
+            <if test="materialCode != null">
+                MATERIAL_CODE,
+            </if>
+            <if test="materialName != null">
+                MATERIAL_NAME,
+            </if>
+            <if test="senderCode != null">
+                SENDER_CODE,
+            </if>
+            <if test="senderName != null">
+                SENDER_NAME,
+            </if>
+            <if test="senderType != null">
+                SENDER_TYPE,
+            </if>
+            <if test="recieverCode != null">
+                RECIEVER_CODE,
+            </if>
+            <if test="recieverName != null">
+                RECIEVER_NAME,
+            </if>
+            <if test="recieverType != null">
+                RECIEVER_TYPE,
+            </if>
+            <if test="memo != null">
+                MEMO,
+            </if>
+            <if test="validFlag != null">
+                VALID_FLAG,
+            </if>
+            <if test="createManNo != null">
+                CREATE_MAN_NO,
+            </if>
+            <if test="createManName != null">
+                CREATE_MAN_NAME,
+            </if>
+            <if test="createTime != null">
+                CREATE_TIME,
+            </if>
+            <if test="updateManNo != null">
+                UPDATE_MAN_NO,
+            </if>
+            <if test="updateManName != null">
+                UPDATE_MAN_NAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="updateManName != null">
+                UPDATE_MAN_NAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationNo != null">
+                #{stationNo,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="stationNum != null">
+                #{stationNum,jdbcType=VARCHAR},
+            </if>
+            <if test="materialCode != null">
+                #{materialCode,jdbcType=VARCHAR},
+            </if>
+            <if test="materialName != null">
+                #{materialName,jdbcType=VARCHAR},
+            </if>
+            <if test="senderCode != null">
+                #{senderCode,jdbcType=VARCHAR},
+            </if>
+            <if test="senderName != null">
+                #{senderName,jdbcType=VARCHAR},
+            </if>
+            <if test="senderType != null">
+                #{senderType,jdbcType=VARCHAR},
+            </if>
+            <if test="recieverCode != null">
+                #{recieverCode,jdbcType=VARCHAR},
+            </if>
+            <if test="recieverName != null">
+                #{recieverName,jdbcType=VARCHAR},
+            </if>
+            <if test="recieverType != null">
+                #{recieverType,jdbcType=VARCHAR},
+            </if>
+            <if test="memo != null">
+                #{memo,jdbcType=VARCHAR},
+            </if>
+            <if test="validFlag != null">
+                #{validFlag,jdbcType=VARCHAR},
+            </if>
+            <if test="createManNo != null">
+                #{createManNo,jdbcType=VARCHAR},
+            </if>
+            <if test="createManName != null">
+                #{createManName,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateManNo != null">
+                #{updateManNo,jdbcType=VARCHAR},
+            </if>
+            <if test="updateManName != null">
+                #{updateManName,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="isUpload != null">
+                IS_UPLOAD,
+            </if>
+            <if test="isInbatches != null">
+                IS_INBATCHES,
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey"
+            parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+        update DYNAMIC_BASE_SC_STATION
+        set NAME            = #{name,jdbcType=VARCHAR},
+            STATION_NUM     = #{stationNum,jdbcType=VARCHAR},
+            MATERIAL_CODE   = #{materialCode,jdbcType=VARCHAR},
+            MATERIAL_NAME   = #{materialName,jdbcType=VARCHAR},
+            SENDER_CODE     = #{senderCode,jdbcType=VARCHAR},
+            SENDER_NAME     = #{senderName,jdbcType=VARCHAR},
+            SENDER_TYPE     = #{senderType,jdbcType=VARCHAR},
+            RECIEVER_CODE   = #{recieverCode,jdbcType=VARCHAR},
+            RECIEVER_NAME   = #{recieverName,jdbcType=VARCHAR},
+            RECIEVER_TYPE   = #{recieverType,jdbcType=VARCHAR},
+            MEMO            = #{memo,jdbcType=VARCHAR},
+            VALID_FLAG      = #{validFlag,jdbcType=VARCHAR},
+            CREATE_MAN_NO   = #{createManNo,jdbcType=VARCHAR},
+            CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+            CREATE_TIME     = #{createTime,jdbcType=TIMESTAMP},
+            UPDATE_MAN_NO   = #{updateManNo,jdbcType=VARCHAR},
+            UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+            UPDATE_TIME     = #{updateTime,jdbcType=TIMESTAMP},
+            IS_UPLOAD   = #{isUpload,jdbcType=VARCHAR},
+            IS_INBATCHES   = #{isInbatches,jdbcType=VARCHAR},
+            where STATION_NO = #{stationNo,jdbcType=VARCHAR}
+    </update>
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+        update DYNAMIC_BASE_SC_STATION
+        <set>
+            <if test="name != null">
+                NAME = #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="stationNum != null">
+                STATION_NUM = #{stationNum,jdbcType=VARCHAR},
+            </if>
+            <if test="materialCode != null">
+                MATERIAL_CODE = #{materialCode,jdbcType=VARCHAR},
+            </if>
+            <if test="materialName != null">
+                MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
+            </if>
+            <if test="senderCode != null">
+                SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
+            </if>
+            <if test="senderName != null">
+                SENDER_NAME = #{senderName,jdbcType=VARCHAR},
+            </if>
+            <if test="senderType != null">
+                SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+            </if>
+            <if test="recieverCode != null">
+                RECIEVER_CODE = #{recieverCode,jdbcType=VARCHAR},
+            </if>
+            <if test="recieverName != null">
+                RECIEVER_NAME = #{recieverName,jdbcType=VARCHAR},
+            </if>
+            <if test="recieverType != null">
+                RECIEVER_TYPE = #{recieverType,jdbcType=VARCHAR},
+            </if>
+            <if test="memo != null">
+                MEMO = #{memo,jdbcType=VARCHAR},
+            </if>
+            <if test="validFlag != null">
+                VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+            </if>
+            <if test="createManNo != null">
+                CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+            </if>
+            <if test="createManName != null">
+                CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateManNo != null">
+                UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+            </if>
+            <if test="updateManName != null">
+                UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="isUpload != null">
+                IS_UPLOAD   = #{isUpload,jdbcType=VARCHAR},
+            </if>
+            <if test="isInbatches != null">
+                IS_INBATCHES   = #{isInbatches,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where STATION_NO = #{stationNo,jdbcType=VARCHAR}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where STATION_NO = #{stationNo,jdbcType=VARCHAR}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into DYNAMIC_BASE_SC_STATION
+        (STATION_NO,
+        NAME, STATION_NUM, MATERIAL_CODE,
+        MATERIAL_NAME, SENDER_CODE, SENDER_NAME,
+        SENDER_TYPE, RECIEVER_CODE, RECIEVER_NAME,
+        RECIEVER_TYPE, MEMO, VALID_FLAG,
+        CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
+        UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, IS_UPLOAD,IS_INBATCHES
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.stationNo,jdbcType=VARCHAR},
+        #{item.name,jdbcType=VARCHAR}, #{item.stationNum,jdbcType=VARCHAR}, #{item.materialCode,jdbcType=VARCHAR},
+        #{item.materialName,jdbcType=VARCHAR}, #{item.senderCode,jdbcType=VARCHAR}, #{item.senderName,jdbcType=VARCHAR},
+        #{item.senderType,jdbcType=VARCHAR}, #{item.recieverCode,jdbcType=VARCHAR},
+        #{item.recieverName,jdbcType=VARCHAR},
+        #{item.recieverType,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR},
+        #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR},
+        #{item.createTime,jdbcType=TIMESTAMP},
+        #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{isUpload,jdbcType=VARCHAR}, #{isInbatches,jdbcType=VARCHAR}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update DYNAMIC_BASE_SC_STATION
+        set
+        STATION_NO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.stationNo,jdbcType=VARCHAR}
+        </foreach>
+        ,NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.name,jdbcType=VARCHAR}
+        </foreach>
+        ,STATION_NUM=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.stationNum,jdbcType=VARCHAR}
+        </foreach>
+        ,MATERIAL_CODE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.materialCode,jdbcType=VARCHAR}
+        </foreach>
+        ,MATERIAL_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.materialName,jdbcType=VARCHAR}
+        </foreach>
+        ,SENDER_CODE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.senderCode,jdbcType=VARCHAR}
+        </foreach>
+        ,SENDER_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.senderName,jdbcType=VARCHAR}
+        </foreach>
+        ,SENDER_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.senderType,jdbcType=VARCHAR}
+        </foreach>
+        ,RECIEVER_CODE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.recieverCode,jdbcType=VARCHAR}
+        </foreach>
+        ,RECIEVER_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.recieverName,jdbcType=VARCHAR}
+        </foreach>
+        ,RECIEVER_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.recieverType,jdbcType=VARCHAR}
+        </foreach>
+        ,MEMO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+        </foreach>
+        ,VALID_FLAG=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+        </foreach>
+        ,CREATE_MAN_NO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+        </foreach>
+        ,CREATE_MAN_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+        </foreach>
+        ,CREATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_MAN_NO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_MAN_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,IS_UPLOAD=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.isUpload,jdbcType=VARCHAR}
+        </foreach>
+        ,IS_INBATCHES=
+        <foreach collection="list" item="item" index="index" separator=" " open="case STATION_NO" close="end">
+            when #{item.stationNo,jdbcType=VARCHAR} then #{item.isInbatches,jdbcType=VARCHAR}
+        </foreach>
+        where STATION_NO in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.stationNo,jdbcType=VARCHAR}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from DYNAMIC_BASE_SC_STATION
+        where STATION_NO in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <!--启用-->
+    <update id="enable" parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+        update DYNAMIC_BASE_SC_STATION
+        set valid_flag    = '1',
+            update_man_no = #{updateManNo},
+            update_man_name = #{updateManName},
+            update_time = #{updateTime}
+        where station_no = #{id}
+    </update>
+    <!--禁用-->
+    <update id="disable"
+            parameterType="com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation">
+        update DYNAMIC_BASE_SC_STATION
+        set valid_flag = '0',
+            update_man_no = #{updateManNo},
+            update_man_name = #{updateManName},
+            update_time = #{updateTime}
+        where station_no = #{id}
+    </update>
 </mapper>

src/main/java/com/jisco/dynamicweight/dynamicbasescstation/service/IDynamicBaseScStationService.java

@@ -18,4 +18,18 @@ import com.steerinfo.framework.service.IBaseService;
  */
 public interface IDynamicBaseScStationService extends IBaseService<DynamicBaseScStation, String>{
 
+    /**
+     * 启用
+     * @param id
+     * @return
+     */
+    boolean disable(String id);
+
+
+    /**
+     * 禁用
+     * @param id
+     * @return
+     */
+    boolean enable(String id);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasescstation/service/impl/DynamicBaseScStationServiceImpl.java

@@ -1,13 +1,18 @@
 package com.jisco.dynamicweight.dynamicbasescstation.service.impl;
 
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
 import com.jisco.dynamicweight.dynamicbasescstation.mapper.DynamicBaseScStationMapper;
 import com.jisco.dynamicweight.dynamicbasescstation.model.DynamicBaseScStation;
 import com.jisco.dynamicweight.dynamicbasescstation.service.IDynamicBaseScStationService;
+import com.jisco.dynamicweight.util.UserUtil;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * DynamicBaseScStation服务实现：
  * @author generator
@@ -31,4 +36,41 @@ public class DynamicBaseScStationServiceImpl extends BaseServiceImpl<DynamicBase
     protected IBaseMapper<DynamicBaseScStation, String> getMapper() {
         return dynamicBaseScStationMapper;
     }
+
+    /**
+     * 启用
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean enable(String id) {
+        DynamicBaseScStation byId = this.getById(id);
+        Assert.notNull(byId, "记录不存在");
+        if (byId.getValidFlag().equals("1")) return false;
+        DynamicBaseScStation config = new DynamicBaseScStation();
+        config.setStationNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseScStationMapper.enable(config) == 1;
+    }
+
+    /**
+     * 禁用
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean disable(String id) {
+        DynamicBaseScStation byId = this.getById(id);
+        if (byId.getValidFlag() == "0") return false;
+        DynamicBaseScStation config = new DynamicBaseScStation();
+        config.setStationNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseScStationMapper.disable(config) == 1;
+    }
+
+    private void setUpdateManInfo(DynamicBaseScStation config) {
+        config.setUpdateManNo(UserUtil.getCurrentUserId());
+        config.setUpdateManName(UserUtil.getCurrentUserName());
+        config.setUpdateTime(new Date());
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasesender/controller/DynamicBaseSenderController.java

@@ -147,4 +147,20 @@ public class DynamicBaseSenderController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "启用", notes = "启用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/enable/{id}")
+    public RESTfulResult enable(@PathVariable String id) {
+        boolean flag = dynamicBaseSenderService.enable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
+
+    @ApiOperation(value = "禁用", notes = "禁用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/disable/{id}")
+    public RESTfulResult disable(@PathVariable String id) {
+        boolean flag = dynamicBaseSenderService.disable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicbasesender/mapper/DynamicBaseSenderMapper.java

@@ -1,5 +1,6 @@
 package com.jisco.dynamicweight.dynamicbasesender.mapper;
 
+import com.jisco.dynamicweight.dynamicbasematerial.model.DynamicBaseMaterial;
 import com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
@@ -7,4 +8,17 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface DynamicBaseSenderMapper extends IBaseMapper<DynamicBaseSender, String> {
+    /**
+     * 启用
+     * @param config
+     * @return
+     */
+    int enable(DynamicBaseSender config);
+
+    /**
+     * 禁用
+     * @param config
+     * @return
+     */
+    int disable(DynamicBaseSender config);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasesender/mapper/DynamicBaseSenderMapper.xml

@@ -415,5 +415,23 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <!--启用-->
+  <update id="enable" parameterType="com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender">
+    update DYNAMIC_BASE_SENDER
+    set valid_flag    = '1',
+        update_man_no = #{updateManNo},
+        update_man_name = #{updateManName},
+        update_time = #{updateTime}
+    where SENDER_NO = #{id}
+  </update>
+  <!--禁用-->
+  <update id="disable"
+          parameterType="com.jisco.dynamicweight.dynamicbasesender.model.DynamicBaseSender">
+    update DYNAMIC_BASE_SENDER
+    set valid_flag = '0',
+        update_man_no = #{updateManNo},
+        update_man_name = #{updateManName},
+        update_time = #{updateTime}
+    where SENDER_NO = #{id}
+  </update>
 </mapper>

src/main/java/com/jisco/dynamicweight/dynamicbasesender/service/IDynamicBaseSenderService.java

@@ -24,4 +24,19 @@ import java.util.List;
 public interface IDynamicBaseSenderService extends IBaseService<DynamicBaseSender, String>{
 
     List<MeterBaseCalibraRelation> queryall(HashMap parmas);
+
+    /**
+     * 启用
+     * @param id
+     * @return
+     */
+    boolean disable(String id);
+
+
+    /**
+     * 禁用
+     * @param id
+     * @return
+     */
+    boolean enable(String id);
 }

src/main/java/com/jisco/dynamicweight/dynamicbasesender/service/impl/DynamicBaseSenderServiceImpl.java

@@ -1,5 +1,8 @@
 package com.jisco.dynamicweight.dynamicbasesender.service.impl;
 
+import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dynamicbasematerial.model.DynamicBaseMaterial;
+import com.jisco.dynamicweight.util.UserUtil;
 import com.steerinfo.baseinfo.meterbasecalibrarelation.model.MeterBaseCalibraRelation;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
@@ -41,4 +44,40 @@ public class DynamicBaseSenderServiceImpl extends BaseServiceImpl<DynamicBaseSen
     public List<MeterBaseCalibraRelation> queryall(HashMap parmas) {
         return dynamicBaseSenderMapper.selectByParameters(parmas);
     }
+    /**
+     * 启用
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean enable(String id) {
+        DynamicBaseSender byId = this.getById(id);
+        Assert.notNull(byId, "记录不存在");
+        if (byId.getValidFlag().equals("1")) return false;
+        DynamicBaseSender config = new DynamicBaseSender();
+        config.setSenderNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseSenderMapper.enable(config) == 1;
+    }
+
+    /**
+     * 禁用
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean disable(String id) {
+        DynamicBaseSender byId = this.getById(id);
+        if (byId.getValidFlag() == "0") return false;
+        DynamicBaseSender config = new DynamicBaseSender();
+        config.setSenderNo(id);
+        setUpdateManInfo(config);
+        return dynamicBaseSenderMapper.disable(config) == 1;
+    }
+
+    private void setUpdateManInfo(DynamicBaseSender config) {
+        config.setUpdateManNo(UserUtil.getCurrentUserId());
+        config.setUpdateManName(UserUtil.getCurrentUserName());
+        config.setUpdateTime(new Date());
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/controller/DynamicWorkAuditdataController.java

@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
@@ -141,16 +143,14 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
     @GetMapping(value = "/getUploadData/{auditingTime1}/{auditingTime2}")
     public RESTfulResult getUploadData(@PathVariable String auditingTime1, @PathVariable String auditingTime2){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date startTime = null;
-        Date endTime = null;
         try {
-            startTime = sdf.parse(auditingTime1);
-            endTime = sdf.parse(auditingTime2);
+            sdf.parse(auditingTime1);
+            sdf.parse(auditingTime2);
         } catch (ParseException e) {
             e.printStackTrace();
             throw new RuntimeException("日期格式化错误");
         }
-        List<DynamicWorkAuditdata> list = dynamicWorkAuditdataService.getUploadData(startTime, endTime);
+        List<DynamicWorkAuditdata> list = dynamicWorkAuditdataService.getUploadData(auditingTime1, auditingTime2);
         return success(list);
     }
 
@@ -170,16 +170,14 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
     @GetMapping(value = "/exportUploadDataExcel/{auditingTime1}/{auditingTime2}")
     public void exportUploadDataExcel(HttpServletResponse response, @PathVariable String auditingTime1, @PathVariable String auditingTime2) throws IOException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date startTime = null;
-        Date endTime = null;
         try {
-            startTime = sdf.parse(auditingTime1);
-            endTime = sdf.parse(auditingTime2);
+            sdf.parse(auditingTime1);
+            sdf.parse(auditingTime2);
         } catch (ParseException e) {
             e.printStackTrace();
             throw new RuntimeException("日期格式化错误");
         }
-        List<DynamicWorkAuditdata> list = dynamicWorkAuditdataService.getUploadData(startTime, endTime);
+        List<DynamicWorkAuditdata> list = dynamicWorkAuditdataService.getUploadData(auditingTime1, auditingTime2);
         ExcelUtil.exportExcel(response, list, DynamicWorkAuditdata.class, "上传数据");
     }
 
@@ -192,8 +190,13 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
 
     @ApiOperation(value = "数据上传", notes = "数据上传")
     @PostMapping(value = "/upload")
-    public RESTfulResult upload(@RequestBody List<DynamicWorkAuditdata> list){
-        dynamicWorkAuditdataService.upload(list);
-        return success("数据上传成功!");
+    public RESTfulResult upload(@RequestBody List<DynamicWorkAuditdata> list) throws UnsupportedEncodingException {
+        try {
+            dynamicWorkAuditdataService.upload(list);
+            return success("数据上传成功!");
+        }catch (Exception exception){
+            System.err.println(new String(exception.getMessage().getBytes("UTF8"), "GBK"));
+            return failed(exception.getMessage());
+        }
     }
 }

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/mapper/DynamicWorkAuditdataMapper.java

@@ -11,6 +11,6 @@ import java.util.List;
 public interface DynamicWorkAuditdataMapper extends IBaseMapper<DynamicWorkAuditdata, String> {
     void save(DynamicWorkAuditdata auditdata);
 
-    List<DynamicWorkAuditdata> getUploadData(@Param("auditingTime1") Date auditingTime1, @Param("auditingTime2") Date auditingTime2);
+    List<DynamicWorkAuditdata> getUploadData(@Param("auditingTime1") String auditingTime1, @Param("auditingTime2") String auditingTime2);
 
 }

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/mapper/DynamicWorkAuditdataMapper.xml

@@ -586,7 +586,7 @@
             UPDATE_MAN_NO     = #{updateManNo,jdbcType=VARCHAR},
             UPDATE_MAN_NAME   = #{updateManName,jdbcType=VARCHAR},
             UPDATE_TIME       = #{updateTime,jdbcType=TIMESTAMP},
-            PIKA_DATA_ID       = #{pikaDataId,jdbcType=TIMESTAMP}
+            PIKA_DATA_ID      = #{pikaDataId,jdbcType=TIMESTAMP}
         where AUDITDATA_NO = #{auditdataNo,jdbcType=VARCHAR}
     </update>
     <update id="updateByPrimaryKeySelective"
@@ -891,7 +891,6 @@
 
     <select id="getUploadData" resultMap="BaseResultMap">
         <include refid="select"/>
-        where AUDITING_TIME &gt;= #{auditingTime1}
-        and AUDITING_TIME &lt;= #{auditingTime2}
+        where to_char(END_TIME,'yyyy-MM-dd HH24:mi:ss') between #{auditingTime1} and #{auditingTime2}
     </select>
 </mapper>

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/service/IDynamicWorkAuditdataService.java

@@ -31,7 +31,7 @@ public interface IDynamicWorkAuditdataService extends IBaseService<DynamicWorkAu
      * @param auditingTime2
      * @return
      */
-    List<DynamicWorkAuditdata> getUploadData(Date auditingTime1, Date auditingTime2);
+    List<DynamicWorkAuditdata> getUploadData(String auditingTime1, String auditingTime2);
 
     void cancelAudit(List<DynamicWorkAuditdata> list);
 

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/service/impl/DynamicWorkAuditdataServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jisco.dynamicweight.dynamicworkauditdata.service.impl;
 
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.lang.Snowflake;
 import com.jisco.dynamicweight.dynamicworkauditdata.mapper.DynamicWorkAuditdataMapper;
 import com.jisco.dynamicweight.dynamicworkauditdata.model.DynamicWorkAuditdata;
 import com.jisco.dynamicweight.dynamicworkauditdata.service.IDynamicWorkAuditdataService;
@@ -10,6 +11,7 @@ import com.jisco.dynamicweight.pika.service.ICenternetService;
 import com.jisco.dynamicweight.util.UserUtil;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.utils.misc.SnowflakeIdWorker;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,6 +20,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -48,6 +51,8 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
     @Autowired
     private ICenternetService centernetService;
 
+    private SnowflakeIdWorker snowflakeIdWorker = new SnowflakeIdWorker(1, 1);
+
     @Override
     protected IBaseMapper<DynamicWorkAuditdata, String> getMapper() {
         return dynamicWorkAuditdataMapper;
@@ -101,7 +106,7 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
             auditdata.setCreateManName(UserUtil.getCurrentUserName());
             auditdata.setCreateTime(new Date());
             dynamicWorkAuditdataMapper.save(auditdata);
-            dynamicWorkUpdataMapper.setUploaded(auditdata);
+            dynamicWorkUpdataMapper.setAudit(auditdata);
         }
     }
 
@@ -113,7 +118,7 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
      * @return
      */
     @Override
-    public List<DynamicWorkAuditdata> getUploadData(Date auditingTime1, Date auditingTime2) {
+    public List<DynamicWorkAuditdata> getUploadData(String auditingTime1, String auditingTime2) {
         List<DynamicWorkAuditdata> list = dynamicWorkAuditdataMapper.getUploadData(auditingTime1, auditingTime2);
         return list;
     }
@@ -123,16 +128,21 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
     public void cancelAudit(List<DynamicWorkAuditdata> list) {
         for (DynamicWorkAuditdata dynamicWorkAuditdata : list) {
             dynamicWorkAuditdataMapper.deleteByPrimaryKey(dynamicWorkAuditdata.getId());
+            dynamicWorkUpdataMapper.setUnAudit(dynamicWorkAuditdata);
         }
     }
 
+    @Transactional
     @Override
     public void cancelUpload(List<DynamicWorkAuditdata> list) {
+        List<String> ids = new ArrayList<>();
         for (DynamicWorkAuditdata auditdata : list) {
             Assert.isTrue(auditdata.getUploaded().equals("1"), "数据未上传，不能撤销上传:" + auditdata);
+            ids.add(auditdata.getPikaDataId());
             auditdata.setUploaded("0");
+            auditdata.setPikaDataId("");
         }
-        centernetService.cancelUpload(list);
+        centernetService.cancelUpload(ids);
         this.batchUpdate(list);
     }
 
@@ -143,7 +153,8 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
         for (DynamicWorkAuditdata auditdata : list) {
             Assert.isTrue(auditdata.getUploaded().equals("0"), "数据已上传，不能重复上传:" + auditdata);
             auditdata.setUploaded("1");
-            auditdata.setPikaDataId("DTC" + auditdata.getId());
+//            auditdata.setPikaDataId("DTC" + auditdata.getId());
+            auditdata.setPikaDataId("DTC" + snowflakeIdWorker.nextId());
         }
         centernetService.upload(list);
         this.batchUpdate(list);

src/main/java/com/jisco/dynamicweight/dynamicworkdata/controller/DynamicWorkDataController.java

@@ -0,0 +1,106 @@
+package com.jisco.dynamicweight.dynamicworkdata.controller;
+
+import com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.jisco.dynamicweight.dynamicworkdata.service.IDynamicWorkDataService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * DynamicWorkData RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-10-26 09:59
+ * 类描述
+ * 修订历史：
+ * 日期：2022-10-26
+ * 作者：generator
+ * 参考：
+ * 描述：DynamicWorkData RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/dynamicworkdatas")
+public class DynamicWorkDataController extends BaseRESTfulController {
+
+    @Autowired
+    IDynamicWorkDataService dynamicWorkDataService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("dynamicworkdata:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicWorkData> list = dynamicWorkDataService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("dynamicworkdata:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<DynamicWorkData> list = dynamicWorkDataService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据DynamicWorkData对象创建")
+    @ApiImplicitParam(name = "dynamicWorkData", value = "详细实体dynamicWorkData", required = true, dataType = "DynamicWorkData")
+    //@RequiresPermissions("dynamicworkdata:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute DynamicWorkData model){
+        DynamicWorkData dynamicWorkData = dynamicWorkDataService.add(model);
+        return success(dynamicWorkData);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicworkdata:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        DynamicWorkData dynamicWorkData = dynamicWorkDataService.getById(id);
+        return success(dynamicWorkData);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的dynamicWorkData信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "dynamicWorkData", value = "详细实体dynamicWorkData", required = true, dataType = "DynamicWorkData")
+    })
+    //@RequiresPermissions("dynamicworkdata:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicWorkData model){
+        model.setId(id);
+        DynamicWorkData dynamicWorkData = dynamicWorkDataService.modify(model);
+        return success(dynamicWorkData);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("dynamicworkdata:delete")
+    @DeleteMapping(value = "/{id}")//String
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<String> ids = ListUtils.convertList(list);
+			  dynamicWorkDataService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/jisco/dynamicweight/dynamicworkdata/mapper/DynamicWorkDataMapper.java

@@ -0,0 +1,9 @@
+package com.jisco.dynamicweight.dynamicworkdata.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DynamicWorkDataMapper extends IBaseMapper<DynamicWorkData, String> {
+}

src/main/java/com/jisco/dynamicweight/dynamicworkdata/mapper/DynamicWorkDataMapper.xml

@@ -0,0 +1,674 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jisco.dynamicweight.dynamicworkdata.mapper.DynamicWorkDataMapper">
+  <resultMap id="BaseResultMap" type="com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData">
+    <id column="DATA_NO" jdbcType="VARCHAR" property="dataNo" />
+    <result column="STATION_CODE" jdbcType="VARCHAR" property="stationCode" />
+    <result column="STATION_NAME" jdbcType="VARCHAR" property="stationName" />
+    <result column="MATERIAL_CODE" jdbcType="VARCHAR" property="materialCode" />
+    <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName" />
+    <result column="WEIGHT" jdbcType="DECIMAL" property="weight" />
+    <result column="START_TIME" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="RECEIVER" jdbcType="VARCHAR" property="receiver" />
+    <result column="RECEIVER_CODE" jdbcType="VARCHAR" property="receiverCode" />
+    <result column="RECEIVER_TYPE" jdbcType="VARCHAR" property="receiverType" />
+    <result column="SENDER" jdbcType="VARCHAR" property="sender" />
+    <result column="SENDER_CODE" jdbcType="VARCHAR" property="senderCode" />
+    <result column="SENDER_TYPE" jdbcType="VARCHAR" property="senderType" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="EXPIRE_FLAG" jdbcType="VARCHAR" property="expireFlag" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="columns">
+    DATA_NO, STATION_CODE, STATION_NAME, MATERIAL_CODE, MATERIAL_NAME, WEIGHT, START_TIME, 
+    END_TIME, RECEIVER, RECEIVER_CODE, RECEIVER_TYPE, SENDER, SENDER_CODE, SENDER_TYPE, 
+    MEMO, EXPIRE_FLAG, VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
+    UPDATE_MAN_NAME, UPDATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.DATA_NO, t.STATION_CODE, t.STATION_NAME, t.MATERIAL_CODE, t.MATERIAL_NAME, t.WEIGHT, 
+    t.START_TIME, t.END_TIME, t.RECEIVER, t.RECEIVER_CODE, t.RECEIVER_TYPE, t.SENDER, 
+    t.SENDER_CODE, t.SENDER_TYPE, t.MEMO, t.EXPIRE_FLAG, t.VALID_FLAG, t.CREATE_MAN_NO, 
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM DYNAMIC_WORK_DATA
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM DYNAMIC_WORK_DATA t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="dataNo != null and dataNo != ''">
+        and DATA_NO = #{dataNo}
+      </if>
+      <if test="stationCode != null and stationCode != ''">
+        and STATION_CODE = #{stationCode}
+      </if>
+      <if test="stationName != null and stationName != ''">
+        and STATION_NAME = #{stationName}
+      </if>
+      <if test="materialCode != null and materialCode != ''">
+        and MATERIAL_CODE = #{materialCode}
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME = #{materialName}
+      </if>
+      <if test="weight != null">
+        and WEIGHT = #{weight}
+      </if>
+      <if test="startTime != null">
+        and TO_CHAR(START_TIME,'yyyy-MM-dd') = #{startTime}
+      </if>
+      <if test="endTime != null">
+        and TO_CHAR(END_TIME,'yyyy-MM-dd') = #{endTime}
+      </if>
+      <if test="receiver != null and receiver != ''">
+        and RECEIVER = #{receiver}
+      </if>
+      <if test="receiverCode != null and receiverCode != ''">
+        and RECEIVER_CODE = #{receiverCode}
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        and RECEIVER_TYPE = #{receiverType}
+      </if>
+      <if test="sender != null and sender != ''">
+        and SENDER = #{sender}
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        and SENDER_CODE = #{senderCode}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE = #{senderType}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="expireFlag != null and expireFlag != ''">
+        and EXPIRE_FLAG = #{expireFlag}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="dataNo != null and dataNo != ''">
+        and DATA_NO LIKE '%${dataNo}%'
+      </if>
+      <if test="stationCode != null and stationCode != ''">
+        and STATION_CODE LIKE '%${stationCode}%'
+      </if>
+      <if test="stationName != null and stationName != ''">
+        and STATION_NAME LIKE '%${stationName}%'
+      </if>
+      <if test="materialCode != null and materialCode != ''">
+        and MATERIAL_CODE LIKE '%${materialCode}%'
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME LIKE '%${materialName}%'
+      </if>
+      <if test="weight != null">
+        and WEIGHT = #{weight}
+      </if>
+      <if test="startTime != null">
+        and TO_CHAR(START_TIME,'yyyy-MM-dd') = #{startTime}
+      </if>
+      <if test="endTime != null">
+        and TO_CHAR(END_TIME,'yyyy-MM-dd') = #{endTime}
+      </if>
+      <if test="receiver != null and receiver != ''">
+        and RECEIVER LIKE '%${receiver}%'
+      </if>
+      <if test="receiverCode != null and receiverCode != ''">
+        and RECEIVER_CODE LIKE '%${receiverCode}%'
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        and RECEIVER_TYPE LIKE '%${receiverType}%'
+      </if>
+      <if test="sender != null and sender != ''">
+        and SENDER LIKE '%${sender}%'
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        and SENDER_CODE LIKE '%${senderCode}%'
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE LIKE '%${senderType}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="expireFlag != null and expireFlag != ''">
+        and EXPIRE_FLAG LIKE '%${expireFlag}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from DYNAMIC_WORK_DATA
+    where DATA_NO = #{dataNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DYNAMIC_WORK_DATA
+    where 1!=1 
+      <if test="stationCode != null and stationCode != ''">
+        or STATION_CODE = #{stationCode}
+      </if>
+      <if test="stationName != null and stationName != ''">
+        or STATION_NAME = #{stationName}
+      </if>
+      <if test="materialCode != null and materialCode != ''">
+        or MATERIAL_CODE = #{materialCode}
+      </if>
+      <if test="materialName != null and materialName != ''">
+        or MATERIAL_NAME = #{materialName}
+      </if>
+      <if test="weight != null">
+        or WEIGHT = #{weight}
+      </if>
+      <if test="startTime != null">
+        or TO_CHAR(START_TIME,'yyyy-MM-dd') = '#{startTime}'
+      </if>
+      <if test="endTime != null">
+        or TO_CHAR(END_TIME,'yyyy-MM-dd') = '#{endTime}'
+      </if>
+      <if test="receiver != null and receiver != ''">
+        or RECEIVER = #{receiver}
+      </if>
+      <if test="receiverCode != null and receiverCode != ''">
+        or RECEIVER_CODE = #{receiverCode}
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        or RECEIVER_TYPE = #{receiverType}
+      </if>
+      <if test="sender != null and sender != ''">
+        or SENDER = #{sender}
+      </if>
+      <if test="senderCode != null and senderCode != ''">
+        or SENDER_CODE = #{senderCode}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        or SENDER_TYPE = #{senderType}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="expireFlag != null and expireFlag != ''">
+        or EXPIRE_FLAG = #{expireFlag}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData">
+    insert into DYNAMIC_WORK_DATA (DATA_NO, STATION_CODE, STATION_NAME, 
+      MATERIAL_CODE, MATERIAL_NAME, WEIGHT, 
+      START_TIME, END_TIME, RECEIVER, 
+      RECEIVER_CODE, RECEIVER_TYPE, SENDER, 
+      SENDER_CODE, SENDER_TYPE, MEMO, 
+      EXPIRE_FLAG, VALID_FLAG, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
+      UPDATE_MAN_NAME, UPDATE_TIME)
+    values (#{dataNo,jdbcType=VARCHAR}, #{stationCode,jdbcType=VARCHAR}, #{stationName,jdbcType=VARCHAR}, 
+      #{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, 
+      #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{receiver,jdbcType=VARCHAR}, 
+      #{receiverCode,jdbcType=VARCHAR}, #{receiverType,jdbcType=VARCHAR}, #{sender,jdbcType=VARCHAR}, 
+      #{senderCode,jdbcType=VARCHAR}, #{senderType,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
+      #{expireFlag,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, 
+      #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, 
+      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData">
+    insert into DYNAMIC_WORK_DATA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="dataNo != null">
+        DATA_NO,
+      </if>
+      <if test="stationCode != null">
+        STATION_CODE,
+      </if>
+      <if test="stationName != null">
+        STATION_NAME,
+      </if>
+      <if test="materialCode != null">
+        MATERIAL_CODE,
+      </if>
+      <if test="materialName != null">
+        MATERIAL_NAME,
+      </if>
+      <if test="weight != null">
+        WEIGHT,
+      </if>
+      <if test="startTime != null">
+        START_TIME,
+      </if>
+      <if test="endTime != null">
+        END_TIME,
+      </if>
+      <if test="receiver != null">
+        RECEIVER,
+      </if>
+      <if test="receiverCode != null">
+        RECEIVER_CODE,
+      </if>
+      <if test="receiverType != null">
+        RECEIVER_TYPE,
+      </if>
+      <if test="sender != null">
+        SENDER,
+      </if>
+      <if test="senderCode != null">
+        SENDER_CODE,
+      </if>
+      <if test="senderType != null">
+        SENDER_TYPE,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="expireFlag != null">
+        EXPIRE_FLAG,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="dataNo != null">
+        #{dataNo,jdbcType=VARCHAR},
+      </if>
+      <if test="stationCode != null">
+        #{stationCode,jdbcType=VARCHAR},
+      </if>
+      <if test="stationName != null">
+        #{stationName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialCode != null">
+        #{materialCode,jdbcType=VARCHAR},
+      </if>
+      <if test="materialName != null">
+        #{materialName,jdbcType=VARCHAR},
+      </if>
+      <if test="weight != null">
+        #{weight,jdbcType=DECIMAL},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="receiver != null">
+        #{receiver,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverCode != null">
+        #{receiverCode,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverType != null">
+        #{receiverType,jdbcType=VARCHAR},
+      </if>
+      <if test="sender != null">
+        #{sender,jdbcType=VARCHAR},
+      </if>
+      <if test="senderCode != null">
+        #{senderCode,jdbcType=VARCHAR},
+      </if>
+      <if test="senderType != null">
+        #{senderType,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="expireFlag != null">
+        #{expireFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData">
+    update DYNAMIC_WORK_DATA
+    set STATION_CODE = #{stationCode,jdbcType=VARCHAR},
+      STATION_NAME = #{stationName,jdbcType=VARCHAR},
+      MATERIAL_CODE = #{materialCode,jdbcType=VARCHAR},
+      MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
+      WEIGHT = #{weight,jdbcType=DECIMAL},
+      START_TIME = #{startTime,jdbcType=TIMESTAMP},
+      END_TIME = #{endTime,jdbcType=TIMESTAMP},
+      RECEIVER = #{receiver,jdbcType=VARCHAR},
+      RECEIVER_CODE = #{receiverCode,jdbcType=VARCHAR},
+      RECEIVER_TYPE = #{receiverType,jdbcType=VARCHAR},
+      SENDER = #{sender,jdbcType=VARCHAR},
+      SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
+      SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      EXPIRE_FLAG = #{expireFlag,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
+    where DATA_NO = #{dataNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData">
+    update DYNAMIC_WORK_DATA
+    <set>
+      <if test="stationCode != null">
+        STATION_CODE = #{stationCode,jdbcType=VARCHAR},
+      </if>
+      <if test="stationName != null">
+        STATION_NAME = #{stationName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialCode != null">
+        MATERIAL_CODE = #{materialCode,jdbcType=VARCHAR},
+      </if>
+      <if test="materialName != null">
+        MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
+      </if>
+      <if test="weight != null">
+        WEIGHT = #{weight,jdbcType=DECIMAL},
+      </if>
+      <if test="startTime != null">
+        START_TIME = #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        END_TIME = #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="receiver != null">
+        RECEIVER = #{receiver,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverCode != null">
+        RECEIVER_CODE = #{receiverCode,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverType != null">
+        RECEIVER_TYPE = #{receiverType,jdbcType=VARCHAR},
+      </if>
+      <if test="sender != null">
+        SENDER = #{sender,jdbcType=VARCHAR},
+      </if>
+      <if test="senderCode != null">
+        SENDER_CODE = #{senderCode,jdbcType=VARCHAR},
+      </if>
+      <if test="senderType != null">
+        SENDER_TYPE = #{senderType,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="expireFlag != null">
+        EXPIRE_FLAG = #{expireFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where DATA_NO = #{dataNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select" />
+    where DATA_NO = #{dataNo,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into DYNAMIC_WORK_DATA 
+      (DATA_NO, 
+      STATION_CODE, STATION_NAME, MATERIAL_CODE, 
+      MATERIAL_NAME, WEIGHT, START_TIME, 
+      END_TIME, RECEIVER, RECEIVER_CODE, 
+      RECEIVER_TYPE, SENDER, SENDER_CODE, 
+      SENDER_TYPE, MEMO, EXPIRE_FLAG, 
+      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.dataNo,jdbcType=VARCHAR}, 
+      #{item.stationCode,jdbcType=VARCHAR}, #{item.stationName,jdbcType=VARCHAR}, #{item.materialCode,jdbcType=VARCHAR}, 
+      #{item.materialName,jdbcType=VARCHAR}, #{item.weight,jdbcType=DECIMAL}, #{item.startTime,jdbcType=TIMESTAMP}, 
+      #{item.endTime,jdbcType=TIMESTAMP}, #{item.receiver,jdbcType=VARCHAR}, #{item.receiverCode,jdbcType=VARCHAR}, 
+      #{item.receiverType,jdbcType=VARCHAR}, #{item.sender,jdbcType=VARCHAR}, #{item.senderCode,jdbcType=VARCHAR}, 
+      #{item.senderType,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.expireFlag,jdbcType=VARCHAR}, 
+      #{item.validFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DYNAMIC_WORK_DATA
+     set
+       DATA_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.dataNo,jdbcType=VARCHAR}
+       </foreach>
+       ,STATION_CODE=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.stationCode,jdbcType=VARCHAR}
+       </foreach>
+       ,STATION_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.stationName,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_CODE=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.materialCode,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.materialName,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.weight,jdbcType=DECIMAL}
+       </foreach>
+       ,START_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.startTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,END_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.endTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RECEIVER=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.receiver,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVER_CODE=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.receiverCode,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVER_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.receiverType,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.sender,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER_CODE=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.senderCode,jdbcType=VARCHAR}
+       </foreach>
+       ,SENDER_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.senderType,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,EXPIRE_FLAG=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.expireFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DATA_NO" separator=" ">
+          when #{item.dataNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where DATA_NO in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.dataNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DYNAMIC_WORK_DATA
+    where DATA_NO in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+    <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/jisco/dynamicweight/dynamicworkdata/model/DynamicWorkData.java

@@ -0,0 +1,378 @@
+package com.jisco.dynamicweight.dynamicworkdata.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="null")
+public class DynamicWorkData implements IBasePO<String> {
+    /**
+     * 数据编号（雪花ID）(DATA_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="数据编号（雪花ID）",required=true)
+    private String dataNo;
+
+    /**
+     * 站点编码(STATION_CODE,VARCHAR,60)
+     */
+    @ApiModelProperty(value="站点编码",required=false)
+    private String stationCode;
+
+    /**
+     * 站点名称(STATION_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="站点名称",required=true)
+    private String stationName;
+
+    /**
+     * 物料编码(MATERIAL_CODE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="物料编码",required=false)
+    private String materialCode;
+
+    /**
+     * 物料名称(MATERIAL_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="物料名称",required=true)
+    private String materialName;
+
+    /**
+     * 重量(WEIGHT,DECIMAL,16)
+     */
+    @ApiModelProperty(value="重量",required=true)
+    private BigDecimal weight;
+
+    /**
+     * 开始时间(START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="开始时间",required=true)
+    private Date startTime;
+
+    /**
+     * 结束时间(END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="结束时间",required=true)
+    private Date endTime;
+
+    /**
+     * 收货库房(RECEIVER,VARCHAR,100)
+     */
+    @ApiModelProperty(value="收货库房",required=false)
+    private String receiver;
+
+    /**
+     * 收货库房编码(RECEIVER_CODE,VARCHAR,40)
+     */
+    @ApiModelProperty(value="收货库房编码",required=false)
+    private String receiverCode;
+
+    /**
+     * 收货点类型(RECEIVER_TYPE,VARCHAR,60)
+     */
+    @ApiModelProperty(value="收货点类型",required=false)
+    private String receiverType;
+
+    /**
+     * 发货库房(SENDER,VARCHAR,100)
+     */
+    @ApiModelProperty(value="发货库房",required=false)
+    private String sender;
+
+    /**
+     * 发货库房编码(SENDER_CODE,VARCHAR,40)
+     */
+    @ApiModelProperty(value="发货库房编码",required=false)
+    private String senderCode;
+
+    /**
+     * 发货点类型(SENDER_TYPE,VARCHAR,60)
+     */
+    @ApiModelProperty(value="发货点类型",required=false)
+    private String senderType;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 到期标志(EXPIRE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="到期标志",required=false)
+    private String expireFlag;
+
+    /**
+     * 状态（0：无效；1:有效）(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（0：无效；1:有效）",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=true)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人姓名",required=true)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.dataNo;
+    }
+
+    @Override
+    public void setId(String dataNo) {
+        this.dataNo = dataNo == null ? null : dataNo.trim();
+    }
+
+    public String getDataNo() {
+        return dataNo;
+    }
+
+    public void setDataNo(String dataNo) {
+        this.dataNo = dataNo == null ? null : dataNo.trim();
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode == null ? null : stationCode.trim();
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName == null ? null : stationName.trim();
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode == null ? null : materialCode.trim();
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName == null ? null : materialName.trim();
+    }
+
+    public BigDecimal getWeight() {
+        return weight;
+    }
+
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver == null ? null : receiver.trim();
+    }
+
+    public String getReceiverCode() {
+        return receiverCode;
+    }
+
+    public void setReceiverCode(String receiverCode) {
+        this.receiverCode = receiverCode == null ? null : receiverCode.trim();
+    }
+
+    public String getReceiverType() {
+        return receiverType;
+    }
+
+    public void setReceiverType(String receiverType) {
+        this.receiverType = receiverType == null ? null : receiverType.trim();
+    }
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender == null ? null : sender.trim();
+    }
+
+    public String getSenderCode() {
+        return senderCode;
+    }
+
+    public void setSenderCode(String senderCode) {
+        this.senderCode = senderCode == null ? null : senderCode.trim();
+    }
+
+    public String getSenderType() {
+        return senderType;
+    }
+
+    public void setSenderType(String senderType) {
+        this.senderType = senderType == null ? null : senderType.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getExpireFlag() {
+        return expireFlag;
+    }
+
+    public void setExpireFlag(String expireFlag) {
+        this.expireFlag = expireFlag == null ? null : expireFlag.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.trim();
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", dataNo=").append(dataNo);
+        sb.append(", stationCode=").append(stationCode);
+        sb.append(", stationName=").append(stationName);
+        sb.append(", materialCode=").append(materialCode);
+        sb.append(", materialName=").append(materialName);
+        sb.append(", weight=").append(weight);
+        sb.append(", startTime=").append(startTime);
+        sb.append(", endTime=").append(endTime);
+        sb.append(", receiver=").append(receiver);
+        sb.append(", receiverCode=").append(receiverCode);
+        sb.append(", receiverType=").append(receiverType);
+        sb.append(", sender=").append(sender);
+        sb.append(", senderCode=").append(senderCode);
+        sb.append(", senderType=").append(senderType);
+        sb.append(", memo=").append(memo);
+        sb.append(", expireFlag=").append(expireFlag);
+        sb.append(", validFlag=").append(validFlag);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/jisco/dynamicweight/dynamicworkdata/service/IDynamicWorkDataService.java

@@ -0,0 +1,21 @@
+package com.jisco.dynamicweight.dynamicworkdata.service;
+
+import com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData;
+import com.steerinfo.framework.service.IBaseService;
+
+/**
+ * DynamicWorkData服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-10-26 09:59
+ * 类描述
+ * 修订历史：
+ * 日期：2022-10-26
+ * 作者：generator
+ * 参考：
+ * 描述：DynamicWorkData服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDynamicWorkDataService extends IBaseService<DynamicWorkData, String>{
+
+}

src/main/java/com/jisco/dynamicweight/dynamicworkdata/service/impl/DynamicWorkDataServiceImpl.java

@@ -0,0 +1,34 @@
+package com.jisco.dynamicweight.dynamicworkdata.service.impl;
+
+import com.jisco.dynamicweight.dynamicworkdata.mapper.DynamicWorkDataMapper;
+import com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.jisco.dynamicweight.dynamicworkdata.service.IDynamicWorkDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * DynamicWorkData服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-10-26 09:59
+ * 类描述
+ * 修订历史：
+ * 日期：2022-10-26
+ * 作者：generator
+ * 参考：
+ * 描述：DynamicWorkData服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dynamicWorkDataService")
+public class DynamicWorkDataServiceImpl extends BaseServiceImpl<DynamicWorkData, String> implements IDynamicWorkDataService {
+
+    @Autowired
+    private DynamicWorkDataMapper dynamicWorkDataMapper;
+
+    @Override
+    protected IBaseMapper<DynamicWorkData, String> getMapper() {
+        return dynamicWorkDataMapper;
+    }
+}

src/main/java/com/jisco/dynamicweight/dynamicworktly/mapper/DynamicWorkTlyMapper.xml

@@ -74,10 +74,10 @@
         and TLY_NO LIKE '%${tlyNo}%'
       </if>
       <if test="rq1 != null">
-        and TO_CHAR(RQ,'yyyy-MM-dd HH24:mi:ss') &gt;= #{rq1}
+        and TO_CHAR(RQ,'yyyy-MM-dd') &gt;= #{rq1}
       </if>
       <if test="rq2 != null">
-        and TO_CHAR(RQ,'yyyy-MM-dd HH24:mi:ss') &lt;= #{rq2}
+        and TO_CHAR(RQ,'yyyy-MM-dd') &lt;= #{rq2}
       </if>
       <if test="weight != null">
         and WEIGHT = #{weight}

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/controller/DynamicWorkUpdataController.java

@@ -1,6 +1,8 @@
 package com.jisco.dynamicweight.dynamicworkupdata.controller;
 
 import cn.hutool.core.lang.Assert;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jisco.dynamicweight.dynamicworkupdata.dto.CokeComputeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.InbatchDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.ReturnedDustDto;
 import com.jisco.dynamicweight.dynamicworkupdata.model.DynamicWorkUpdata;
@@ -18,6 +20,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -25,11 +28,14 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
  * DynamicWorkUpdata RESTful接口：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2022-01-18 10:14
  * 类描述
@@ -38,8 +44,8 @@ import java.util.*;
  * 作者：generator
  * 参考：
  * 描述：DynamicWorkUpdata RESTful接口
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @RestController
 @RequestMapping("/${api.version}/dynamicworkupdatas")
@@ -48,37 +54,37 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
     @Autowired
     IDynamicWorkUpdataService dynamicWorkUpdataService;
 
-    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiOperation(value = "获取列表", notes = "分页查询")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
     //@RequiresPermissions("dynamicworkupdata:view")
     @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+    public RESTfulResult list(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
         dynamicWorkUpdataService.recalc();
         PageList<DynamicWorkUpdata> list = dynamicWorkUpdataService.queryForPage(parmas, pageNum, pageSize);
         return success(list);
     }
 
-    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
     //@RequiresPermissions("dynamicworkupdata:view")
     @GetMapping(value = "/like/")
-    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        dynamicWorkUpdataService.recalc();
+    public RESTfulResult listLike(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+//        dynamicWorkUpdataService.recalc();
         PageList<DynamicWorkUpdata> list = dynamicWorkUpdataService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
-    
-    @ApiOperation(value="创建", notes="根据DynamicWorkUpdata对象创建")
+
+    @ApiOperation(value = "创建", notes = "根据DynamicWorkUpdata对象创建")
     @ApiImplicitParam(name = "dynamicWorkUpdata", value = "详细实体dynamicWorkUpdata", required = true, dataType = "DynamicWorkUpdata")
     //@RequiresPermissions("dynamicworkupdata:create")
     @PostMapping(value = "/")
-    public RESTfulResult add(@RequestBody DynamicWorkUpdata model){
+    public RESTfulResult add(@RequestBody DynamicWorkUpdata model) {
         Assert.isTrue(StringUtils.isNotBlank(model.getStationCode()), "站点编码不能为空!");
         Assert.isTrue(StringUtils.isNotBlank(model.getStationName()), "站点名称不能为空!");
         Assert.isTrue(StringUtils.isNotBlank(model.getMaterialCode()), "物料编码不能为空!");
@@ -92,7 +98,7 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         Assert.isTrue(Objects.nonNull(model.getStartTime()), "开始时间不能为空!");
         Assert.isTrue(Objects.nonNull(model.getEndTime()), "结束时间不能为空!");
         Assert.isTrue(Objects.nonNull(model.getWeight()), "重量不能为空!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
+        model.setValidFlag("1");
         model.setUploaded("0");
         model.setAuditingFlag("0");
         model.setCreateManNo(UserUtil.getCurrentUserId());
@@ -102,23 +108,23 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         return success(dynamicWorkUpdata);
     }
 
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiOperation(value = "获取详细信息", notes = "根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("dynamicworkupdata:view")
     @GetMapping(value = "/{id}")
-    public RESTfulResult get(@PathVariable String id){
+    public RESTfulResult get(@PathVariable String id) {
         DynamicWorkUpdata dynamicWorkUpdata = dynamicWorkUpdataService.getById(id);
         return success(dynamicWorkUpdata);
     }
 
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的dynamicWorkUpdata信息来更新详细信息")
+    @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象，并根据传过来的dynamicWorkUpdata信息来更新详细信息")
     @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
-        @ApiImplicitParam(name = "dynamicWorkUpdata", value = "详细实体dynamicWorkUpdata", required = true, dataType = "DynamicWorkUpdata")
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "dynamicWorkUpdata", value = "详细实体dynamicWorkUpdata", required = true, dataType = "DynamicWorkUpdata")
     })
     //@RequiresPermissions("dynamicworkupdata:update")
-    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicWorkUpdata model){
+    @PutMapping(value = "/{id}", produces = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody DynamicWorkUpdata model) {
         Assert.isTrue(StringUtils.isNotBlank(model.getStationCode()), "站点编码不能为空!");
         Assert.isTrue(StringUtils.isNotBlank(model.getStationName()), "站点名称不能为空!");
         Assert.isTrue(StringUtils.isNotBlank(model.getMaterialCode()), "物料编码不能为空!");
@@ -141,17 +147,17 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         return success(dynamicWorkUpdata);
     }
 
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("dynamicworkupdata:delete")
     @DeleteMapping(value = "/{id}")//String
-    public RESTfulResult delete(@PathVariable String id){
-    	List<String> list = Arrays.asList(id.split(","));
-    	if(ListUtils.isNotEmpty(list)) {
-	    	List<String> ids = ListUtils.convertList(list);
-			  dynamicWorkUpdataService.delete(ids);
-    	}
-      return success();
+    public RESTfulResult delete(@PathVariable String id) {
+        List<String> list = Arrays.asList(id.split(","));
+        if (ListUtils.isNotEmpty(list)) {
+            List<String> ids = ListUtils.convertList(list);
+            dynamicWorkUpdataService.delete(ids);
+        }
+        return success();
     }
 
     @ApiOperation(value = "导出Excel", notes = "导出Excel")
@@ -161,56 +167,73 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         ExcelUtil.exportExcel(response, list, DynamicWorkUpdata.class, "动态秤称重数据");
     }
 
-    @ApiOperation(value = "重新获取动态秤称重数据", notes = "重新获取动态秤称重数据")
-    @GetMapping(value = "/recalc")//String
-    public RESTfulResult recalc(){
-        dynamicWorkUpdataService.recalc();
-        return success();
-    }
+//    @ApiOperation(value = "重新获取动态秤称重数据", notes = "重新获取动态秤称重数据")
+//    @GetMapping(value = "/recalc")//String
+//    public RESTfulResult recalc(){
+//        dynamicWorkUpdataService.recalc();
+//        return success();
+//    }
 
     @ApiOperation(value = "数据分批总重量", notes = "数据分批总重量")
-    @GetMapping(value = "/inbatchsTotalWeight/{stationCode}/{date}")
-    public RESTfulResult inbatchsTotalWeight(@PathVariable String stationCode, @PathVariable Date date){
-        Assert.isTrue(StringUtils.isNotBlank(stationCode), "站点编码（皮卡系统）不能为空！");
-        Assert.isTrue(Objects.nonNull(date), "分批日期不能为空！");
-        BigDecimal weight = dynamicWorkUpdataService.inbatchsTotalWeight(stationCode, date);
+    @GetMapping(value = "/inbatchsTotalWeight/{updataNo}/{date1}/{date2}")
+    public RESTfulResult inbatchsTotalWeight(@PathVariable String updataNo, @PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime date1, @PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime date2) {
+        Assert.isTrue(StringUtils.isNotBlank(updataNo), "记录编号不能为空！");
+        Assert.notNull(date1, "开始时间不能为空！");
+        Assert.notNull(date2, "结束时间不能为空！");
+        Date startTime = Date.from(date1.atZone(ZoneId.systemDefault()).toInstant());
+        Date endTime = Date.from(date2.atZone(ZoneId.systemDefault()).toInstant());
+        BigDecimal weight = dynamicWorkUpdataService.inbatchsTotalWeight(updataNo, startTime, endTime);
         return success(weight);
     }
 
     @ApiOperation(value = "数据分批", notes = "数据分批")
-    @PostMapping(value = "/inbatchs/{id}")
-    public RESTfulResult inbatchs(@PathVariable String id, @RequestBody List<InbatchDto> list){
-        dynamicWorkUpdataService.inbatchs(id, list);
+    @PostMapping(value = "/inbatchs/{updataNo}/{date1}/{date2}")
+    public RESTfulResult inbatchs(@PathVariable String updataNo, @PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime date1, @PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime date2, @RequestBody List<InbatchDto> list) {
+        Assert.isTrue(StringUtils.isNotBlank(updataNo), "记录编号不能为空！");
+        Assert.notNull(date1, "开始时间不能为空！");
+        Assert.notNull(date2, "结束时间不能为空！");
+        Date startTime = Date.from(date1.atZone(ZoneId.systemDefault()).toInstant());
+        Date endTime = Date.from(date2.atZone(ZoneId.systemDefault()).toInstant());
+        dynamicWorkUpdataService.inbatchs(updataNo, startTime, endTime, list);
         return success();
     }
 
     @ApiOperation(value = "返粉总重量", notes = "返粉总重量")
-    @GetMapping(value = "/returnedDustTotalWeight/{id}")
-    public RESTfulResult returnedDustWeight(@PathVariable String id){
-        Assert.isTrue(StringUtils.isNotBlank(id), "id不能为空！");
-        BigDecimal weight = dynamicWorkUpdataService.returnedDustWeight(id);
+    @GetMapping(value = "/returnedDustTotalWeight/{updataNo}/{date1}/{date2}")
+    public RESTfulResult returnedDustWeight(@PathVariable String updataNo, @PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime date1, @PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime date2) {
+        Assert.isTrue(StringUtils.isNotBlank(updataNo), "记录编号不能为空！");
+        Assert.notNull(date1, "开始时间不能为空！");
+        Assert.notNull(date2, "结束时间不能为空！");
+        Date startTime = Date.from(date1.atZone(ZoneId.systemDefault()).toInstant());
+        Date endTime = Date.from(date2.atZone(ZoneId.systemDefault()).toInstant());
+        BigDecimal weight = dynamicWorkUpdataService.returnedDustWeight(updataNo, startTime, endTime);
         return success(weight);
     }
 
     @ApiOperation(value = "返粉", notes = "返粉")
-    @PostMapping(value = "/returnedDust/{id}")
-    public RESTfulResult returnedDust(@PathVariable String id, @RequestBody List<ReturnedDustDto> list){
-        dynamicWorkUpdataService.returnedDust(id, list);
+    @PostMapping(value = "/returnedDust/{updataNo}/{date1}/{date2}")
+    public RESTfulResult returnedDust(@PathVariable String updataNo, @PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime date1, @PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime date2, @RequestBody List<ReturnedDustDto> list) {
+        Assert.isTrue(StringUtils.isNotBlank(updataNo), "记录编号不能为空！");
+        Assert.notNull(date1, "开始时间不能为空！");
+        Assert.notNull(date2, "结束时间不能为空！");
+        Date startTime = Date.from(date1.atZone(ZoneId.systemDefault()).toInstant());
+        Date endTime = Date.from(date2.atZone(ZoneId.systemDefault()).toInstant());
+        dynamicWorkUpdataService.returnedDust(updataNo, startTime, endTime, list);
         return success();
     }
 
     @ApiOperation(value = "重新计算焦炭量", notes = "重新计算焦炭量")
-    @PostMapping(value = "/recalcCoke/{k:.+}")
-    public RESTfulResult recalcCoke(@PathVariable BigDecimal k, @RequestBody List<DynamicWorkUpdata> list){
-        dynamicWorkUpdataService.recalcCoke(k, list);
+    @PostMapping(value = "recalcCoke")
+    public RESTfulResult recalcCoke(@RequestBody CokeComputeDto model) {
+        dynamicWorkUpdataService.recalcCoke(model);
         return success();
     }
 
 
-    @ApiOperation(value="动态秤日报表", notes="动态秤日报表")
+    @ApiOperation(value = "动态秤日报表", notes = "动态秤日报表")
     @ApiImplicitParam(paramType = "path", name = "date", value = "date", required = true, dataType = "Date")
     @GetMapping(value = "dailyReport/{date}")
-    public RESTfulResult dailyReport(@PathVariable String date){
+    public RESTfulResult dailyReport(@PathVariable String date) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
             sdf.parse(date);
@@ -231,10 +254,10 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         ExcelUtil.exportExcel(response, list, DailyReportVO.class, "动态秤称重数据");
     }
 
-    @ApiOperation(value="查询待审核数据", notes="查询待审核数据")
+    @ApiOperation(value = "查询待审核数据", notes = "查询待审核数据")
     @ApiImplicitParam(paramType = "path", name = "date", value = "date", required = true, dataType = "Date")
     @GetMapping(value = "getAuditData/{date}")
-    public RESTfulResult getAuditData(@PathVariable String date){
+    public RESTfulResult getAuditData(@PathVariable String date) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
             sdf.parse(date);
@@ -254,4 +277,36 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         List<AuditDataVO> list = dynamicWorkUpdataService.getAuditData(date);
         ExcelUtil.exportExcel(response, list, AuditDataVO.class, "待审核数据");
     }
+
+    @ApiOperation(value = "启用", notes = "启用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/enable/{id}")
+    public RESTfulResult enable(@PathVariable String id) {
+        boolean flag = dynamicWorkUpdataService.enable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
+
+    @ApiOperation(value = "禁用", notes = "禁用")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/disable/{id}")
+    public RESTfulResult disable(@PathVariable String id) {
+        boolean flag = dynamicWorkUpdataService.disable(id);
+        return flag ? success(null, "操作成功") : failed(null, "操作失败");
+    }
+
+    @ApiOperation(value = "重新生成数据", notes = "删除上传数据表中的数据，并修改采集数据表中的过期标识expire_flag为0，重新生成上传数据表的数据")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/reGenerate/{id}")
+    public RESTfulResult reGenerate(@PathVariable String id) {
+        dynamicWorkUpdataService.reGenerate(id);
+        return success(null, "操作成功");
+    }
+
+    @ApiOperation(value = "重新采集数据", notes = "删除上传数据表中的数据和采集数据表中的数据，重新采集数据")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @GetMapping(value = "/reCollect/{id}")
+    public RESTfulResult reCollect(@PathVariable String id) {
+        dynamicWorkUpdataService.reCollect(id);
+        return success(null, "操作成功");
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/dto/CokeComputeDto.java

@@ -0,0 +1,34 @@
+package com.jisco.dynamicweight.dynamicworkupdata.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class CokeComputeDto {
+
+    private BigDecimal k;
+    private Date date;
+
+    public BigDecimal getK() {
+        return k;
+    }
+
+    public void setK(BigDecimal k) {
+        this.k = k;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    @Override
+    public String toString() {
+        return "CokeComputeDto{" +
+                "k='" + k + '\'' +
+                ", date=" + date +
+                '}';
+    }
+}

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/mapper/DynamicWorkUpdataMapper.java

@@ -1,5 +1,6 @@
 package com.jisco.dynamicweight.dynamicworkupdata.mapper;
 
+import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
 import com.jisco.dynamicweight.dynamicworkauditdata.model.DynamicWorkAuditdata;
 import com.jisco.dynamicweight.dynamicworkupdata.model.DynamicWorkUpdata;
 import com.jisco.dynamicweight.dynamicworkupdata.vo.AuditDataVO;
@@ -24,11 +25,11 @@ public interface DynamicWorkUpdataMapper extends IBaseMapper<DynamicWorkUpdata,
      * 数据分批总重量
      *
      * @param stationCode
-     * @param date1
-     * @param date2
+     * @param startTime
+     * @param endTime
      * @return
      */
-    BigDecimal inbatchsTotalWeight(String stationCode, Date date1, Date date2);
+    BigDecimal inbatchsTotalWeight(String stationCode, String materialCode, Date startTime, Date endTime);
 
     /**
      * 返粉总重量
@@ -36,7 +37,7 @@ public interface DynamicWorkUpdataMapper extends IBaseMapper<DynamicWorkUpdata,
      * @param map String meterialCode, Date date1, Date date2, BigDecimal weight
      * @return
      */
-    void returnedDustWeight(Map<String, Object> map);
+    BigDecimal returnedDustWeight(Map<String, Object> map);
 
     /**
      * 动态秤日报表
@@ -66,7 +67,47 @@ public interface DynamicWorkUpdataMapper extends IBaseMapper<DynamicWorkUpdata,
      * @param bl24end
      * @return
      */
-    List<AuditDataVO> getAuditData(LocalDateTime bl8start, LocalDateTime bl8end, LocalDateTime bl16start, LocalDateTime bl16end, LocalDateTime bl24start, LocalDateTime bl24end);
+    List<AuditDataVO> getAuditData(String bl8start, String bl8end, String bl16start, String bl16end, String bl24start, String bl24end);
 
-    void setUploaded(DynamicWorkAuditdata auditdata);
+    /**
+     * 设置审核状态
+     * @param auditdata
+     */
+    void setAudit(DynamicWorkAuditdata auditdata);
+
+    /**
+     * 启用
+     * @param config
+     * @return
+     */
+    int enable(DynamicWorkUpdata config);
+
+    /**
+     * 禁用
+     * @param config
+     * @return
+     */
+    int disable(DynamicWorkUpdata config);
+
+    /**
+     * 批量作废数据
+     * @param stationCode
+     * @param materialCode
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    int batchDisable(String stationCode, String materialCode, Date startTime, Date endTime, String updateManNo, String updateManName, Date updateTime);
+
+    /**
+     * 作废返粉的原始数据
+     * @param map
+     */
+    void disableForReturnedDust(Map<String, Object> map);
+
+    /**
+     * 取消审核状态
+     * @param dynamicWorkAuditdata
+     */
+    void setUnAudit(DynamicWorkAuditdata dynamicWorkAuditdata);
 }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/mapper/DynamicWorkUpdataMapper.xml

@@ -62,12 +62,8 @@
     </sql>
     <sql id="select_alias">
         SELECT
-        <include refid="columns_alias"/>,
-        DYNAMIC_BASE_BATCH_STATION.IS_UPLOAD, DYNAMIC_BASE_BATCH_STATION.IS_INBATCHES,
-        DYNAMIC_BASE_MATERIAL.IS_RETURNED_DUST, DYNAMIC_BASE_MATERIAL.IS_COKE
+        <include refid="columns_alias"/>
         FROM DYNAMIC_WORK_UPDATA t
-        left join DYNAMIC_BASE_BATCH_STATION on t.STATION_CODE = DYNAMIC_BASE_BATCH_STATION.PIKA_CODE
-        left join DYNAMIC_BASE_MATERIAL on t.MATERIAL_CODE = DYNAMIC_BASE_MATERIAL.MATERIAL_CODE
     </sql>
     <sql id="where">
         <where>
@@ -164,18 +160,18 @@
             <if test="updateTime != null">
                 and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
             </if>
-            <if test="isUpload != null">
-                and IS_UPLOAD = #{isUpload}
-            </if>
-            <if test="isInbatches != null">
-                and IS_INBATCHES = #{isInbatches}
-            </if>
-            <if test="isReturnedDust != null">
-                and IS_RETURNED_DUST = #{isReturnedDust}
-            </if>
-            <if test="isCoke != null">
-                and IS_COKE = #{isCoke}
-            </if>
+            <!--            <if test="isUpload != null">-->
+            <!--                and IS_UPLOAD = #{isUpload}-->
+            <!--            </if>-->
+            <!--            <if test="isInbatches != null">-->
+            <!--                and IS_INBATCHES = #{isInbatches}-->
+            <!--            </if>-->
+            <!--            <if test="isReturnedDust != null">-->
+            <!--                and IS_RETURNED_DUST = #{isReturnedDust}-->
+            <!--            </if>-->
+            <!--            <if test="isCoke != null">-->
+            <!--                and IS_COKE = #{isCoke}-->
+            <!--            </if>-->
         </where>
     </sql>
     <sql id="whereLike">
@@ -718,19 +714,6 @@
         <include refid="select_alias"/>
         <include refid="whereLike"/>
     </select>
-    <select id="recalc" statementType="CALLABLE">
-        {call GENERATEUPDATA()}
-    </select>
-    <select id="inbatchsTotalWeight" resultType="java.math.BigDecimal">
-        select sum(weight)
-        from DYNAMIC_WORK_UPDATA
-        where STATION_CODE = #{stationCode}
-          and END_TIME between #{date1} and #{date2}
-    </select>
-    <select id="returnedDustWeight" statementType="CALLABLE" parameterType="map">
-        {call RETURNEDDUSTWEIGHT(#{meterialCode}, #{date1}, #{date2},
-                                 #{weight,mode=OUT,jdbcType=NUMERIC,javaType=java.math.BigDecimal})}
-    </select>
     <resultMap id="DailyReportMap" type="com.jisco.dynamicweight.dynamicworkupdata.vo.DailyReportVO">
         <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName"/>
         <result column="STATION_NAME" jdbcType="VARCHAR" property="stationName"/>
@@ -902,9 +885,10 @@
                         SENDER_NAME,
                         SENDER_TYPE
                  FROM DYNAMIC_WORK_UPDATA
-                 WHERE END_TIME &gt;= #{bl8start}
-                   AND END_TIME &lt;= #{bl24end}
+                 WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl8start}
+                   AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl24end}
                    AND VALID_FLAG = '1'
+                   AND AUDITING_FLAG = '0'
                    AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                    AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
                  GROUP BY STATION_CODE,
@@ -925,9 +909,10 @@
                      SENDER_NAME,
                      sum(WEIGHT) B8
               FROM DYNAMIC_WORK_UPDATA
-              WHERE END_TIME &gt;= #{bl8start}
-                AND END_TIME &lt;= #{bl8end}
+              WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl8start}
+                AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl8end}
                 AND VALID_FLAG = '1'
+                AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
               GROUP BY STATION_CODE,
@@ -952,9 +937,10 @@
                      SENDER_NAME,
                      sum(WEIGHT) B16
               FROM DYNAMIC_WORK_UPDATA
-              WHERE END_TIME &gt;= #{bl16start}
-                AND END_TIME &lt;= #{bl16end}
+              WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl16start}
+                AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl16end}
                 AND VALID_FLAG = '1'
+                AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
               GROUP BY STATION_CODE,
@@ -979,8 +965,8 @@
                      SENDER_NAME,
                      sum(WEIGHT) B24
               FROM DYNAMIC_WORK_UPDATA
-              WHERE END_TIME &gt;= #{bl24start}
-                AND END_TIME &lt;= #{bl24end}
+              WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl24start}
+                AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl24end}
                 AND VALID_FLAG = '1'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
@@ -1158,7 +1144,96 @@
             #{item.updataNo,jdbcType=VARCHAR}
         </foreach>
     </update>
-    <update id="setUploaded">
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from DYNAMIC_WORK_UPDATA
+        where UPDATA_NO in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <!--启用-->
+    <update id="enable" parameterType="com.jisco.dynamicweight.dynamicworkupdata.model.DynamicWorkUpdata">
+        update DYNAMIC_WORK_UPDATA
+        set valid_flag      = '1',
+            update_man_no   = #{updateManNo},
+            update_man_name = #{updateManName},
+            update_time     = #{updateTime}
+        where UPDATA_NO = #{id}
+    </update>
+    <!--禁用-->
+    <update id="disable"
+            parameterType="com.jisco.dynamicweight.dynamicworkupdata.model.DynamicWorkUpdata">
+        update DYNAMIC_WORK_UPDATA
+        set valid_flag      = '0',
+            update_man_no   = #{updateManNo},
+            update_man_name = #{updateManName},
+            update_time     = #{updateTime}
+        where UPDATA_NO = #{id}
+    </update>
+    <!--批量作废数据-->
+    <update id="batchDisable"
+            parameterType="com.jisco.dynamicweight.dynamicworkupdata.model.DynamicWorkUpdata">
+        update DYNAMIC_WORK_UPDATA
+        set valid_flag      = '0',
+            update_man_no   = #{updateManNo},
+            update_man_name = #{updateManName},
+            update_time     = #{updateTime}
+        where STATION_CODE = #{stationCode}
+          and MATERIAL_CODE = #{materialCode}
+          and END_TIME between #{startTime} and #{endTime}
+    </update>
+    <select id="recalc" statementType="CALLABLE">
+        {call GENERATEUPDATA()}
+    </select>
+    <!--    计算分批总重量-->
+    <select id="inbatchsTotalWeight" resultType="java.math.BigDecimal">
+        select sum(weight)
+        from DYNAMIC_WORK_UPDATA
+        where STATION_CODE = #{stationCode}
+          and MATERIAL_CODE = #{materialCode}
+          and END_TIME between #{startTime} and #{endTime}
+          and VALID_FLAG = '1'
+          and AUDITING_FLAG = '0'
+    </select>
+    <!--    计算返粉总重量-->
+    <select id="returnedDustWeight" resultType="java.math.BigDecimal" parameterType="map">
+        select sum(WEIGHT) as WEIGHT
+        from DYNAMIC_WORK_UPDATA
+        where
+        MATERIAL_CODE = #{meterialCode}
+        and STATION_CODE in
+        <foreach collection="stationCodes" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and RECIEVER_CODE in
+        <foreach collection="receiverCodes" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and END_TIME between #{startTime} and #{endTime}
+        and VALID_FLAG = '1'
+        and AUDITING_FLAG = '0'
+    </select>
+    <!--    作废返粉的原始数据-->
+    <select id="disableForReturnedDust" parameterType="map">
+        update DYNAMIC_WORK_UPDATA
+        set VALID_FLAG = '0'
+        where
+        MATERIAL_CODE = #{meterialCode}
+        and STATION_CODE in
+        <foreach collection="stationCodes" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and RECIEVER_CODE in
+        <foreach collection="receiverCodes" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and END_TIME between #{startTime} and #{endTime}
+        and VALID_FLAG = '1'
+        and AUDITING_FLAG = '0'
+    </select>
+    <update id="setAudit">
         UPDATE DYNAMIC_WORK_UPDATA t
         SET t.AUDITING_FLAG = '1'
         WHERE t.STATION_NAME = #{stationName}
@@ -1174,14 +1249,20 @@
           AND t.END_TIME &gt;= #{startTime}
           AND t.END_TIME &lt;= #{endTime}
     </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from DYNAMIC_WORK_UPDATA
-        where UPDATA_NO in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
+    <update id="setUnAudit">
+        UPDATE DYNAMIC_WORK_UPDATA t
+        SET t.AUDITING_FLAG = '0'
+        WHERE t.STATION_NAME = #{stationName}
+          AND t.STATION_CODE = #{stationCode}
+          AND t.MATERIAL_CODE = #{materialCode}
+          AND t.MATERIAL_NAME = #{materialName}
+          AND t.RECIEVER_NAME = #{recieverName}
+          AND t.RECIEVER_CODE = #{recieverCode}
+          AND t.SENDER_NAME = #{senderName}
+          AND t.SENDER_CODE = #{senderCode}
+          AND t.RECIEVER_TYPE = #{recieverType}
+          AND t.SENDER_TYPE = #{senderType}
+          AND t.END_TIME &gt;= #{startTime}
+          AND t.END_TIME &lt;= #{endTime}
+    </update>
 </mapper>

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/model/DynamicWorkUpdata.java

@@ -7,204 +7,204 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
-@ApiModel(value="动态秤称重数据")
+@ApiModel(value = "动态秤称重数据")
 public class DynamicWorkUpdata implements IBasePO<String> {
     /**
      * 系统编号(UPDATA_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="系统编号",required=true)
+    @ApiModelProperty(value = "系统编号", required = true)
     private String updataNo;
 
     /**
      * 物料名称(MATERIAL_NAME,VARCHAR,60)
      */
-    @ApiModelProperty(value="物料名称",required=false)
+    @ApiModelProperty(value = "物料名称", required = false)
     private String materialName;
 
     /**
      * 物料编码(MATERIAL_CODE,VARCHAR,20)
      */
-    @ApiModelProperty(value="物料编码",required=false)
+    @ApiModelProperty(value = "物料编码", required = false)
     private String materialCode;
 
     /**
      * 站点名称(STATION_NAME,VARCHAR,60)
      */
-    @ApiModelProperty(value="站点名称",required=false)
+    @ApiModelProperty(value = "站点名称", required = false)
     private String stationName;
 
     /**
      * 站点编码(STATION_CODE,VARCHAR,60)
      */
-    @ApiModelProperty(value="站点编码",required=false)
+    @ApiModelProperty(value = "站点编码", required = false)
     private String stationCode;
 
     /**
      * 收货库房(RECIEVER_NAME,VARCHAR,60)
      */
-    @ApiModelProperty(value="收货库房",required=false)
+    @ApiModelProperty(value = "收货库房", required = false)
     private String recieverName;
 
     /**
      * 收货库房编码(RECIEVER_CODE,VARCHAR,60)
      */
-    @ApiModelProperty(value="收货库房编码",required=false)
+    @ApiModelProperty(value = "收货库房编码", required = false)
     private String recieverCode;
 
     /**
      * 发货库房(SENDER_NAME,VARCHAR,60)
      */
-    @ApiModelProperty(value="发货库房",required=false)
+    @ApiModelProperty(value = "发货库房", required = false)
     private String senderName;
 
     /**
      * 发货库房编码(SENDER_CODE,VARCHAR,60)
      */
-    @ApiModelProperty(value="发货库房编码",required=false)
+    @ApiModelProperty(value = "发货库房编码", required = false)
     private String senderCode;
 
     /**
      * 重量(WEIGHT,VARCHAR,20)
      */
-    @ApiModelProperty(value="重量",required=false)
+    @ApiModelProperty(value = "重量", required = false)
     private BigDecimal weight;
 
     /**
      * 收货点类型(RECIEVER_TYPE,VARCHAR,60)
      */
-    @ApiModelProperty(value="收货点类型",required=false)
+    @ApiModelProperty(value = "收货点类型", required = false)
     private String recieverType;
 
     /**
      * 发货点类型(SENDER_TYPE,VARCHAR,60)
      */
-    @ApiModelProperty(value="发货点类型",required=false)
+    @ApiModelProperty(value = "发货点类型", required = false)
     private String senderType;
 
     /**
      * 上传标志(UPLOADED,VARCHAR,1)
      */
-    @ApiModelProperty(value="上传标志",required=false)
-    private String uploaded;
+    @ApiModelProperty(value = "上传标志", required = false)
+    private String uploaded="0";
 
     /**
      * 开始时间(START_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="开始时间",required=false)
+    @ApiModelProperty(value = "开始时间", required = false)
     private Date startTime;
 
     /**
      * 结束时间(END_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="结束时间",required=false)
+    @ApiModelProperty(value = "结束时间", required = false)
     private Date endTime;
 
     /**
      * 备注(MEMO,VARCHAR,100)
      */
-    @ApiModelProperty(value="备注",required=false)
+    @ApiModelProperty(value = "备注", required = false)
     private String memo;
 
     /**
      * 审核人编号(AUDITING_MAN_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="审核人编号",required=false)
+    @ApiModelProperty(value = "审核人编号", required = false)
     private String auditingManNo;
 
     /**
      * 原始记录(ORIGINAL_VALUE,VARCHAR,20)
      */
-    @ApiModelProperty(value="原始记录",required=false)
+    @ApiModelProperty(value = "原始记录", required = false)
     private String originalValue;
 
     /**
      * 系统修改日志(SYSLOG,VARCHAR,2000)
      */
-    @ApiModelProperty(value="系统修改日志",required=false)
+    @ApiModelProperty(value = "系统修改日志", required = false)
     private String syslog;
 
     /**
      * 审核人姓名(AUDITING_MAN_NAME,VARCHAR,30)
      */
-    @ApiModelProperty(value="审核人姓名",required=false)
+    @ApiModelProperty(value = "审核人姓名", required = false)
     private String auditingManName;
 
     /**
      * 审核时间(AUDITING_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="审核时间",required=false)
+    @ApiModelProperty(value = "审核时间", required = false)
     private Date auditingTime;
 
     /**
      * 审核标识(AUDITING_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="审核标识",required=false)
-    private String auditingFlag;
+    @ApiModelProperty(value = "审核标识", required = false)
+    private String auditingFlag="0";
 
     /**
      * 状态（0：无效；1:有效）(VALID_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="状态（0：无效；1:有效）",required=true)
-    private String validFlag;
+    @ApiModelProperty(value = "状态（0：无效；1:有效）", required = true)
+    private String validFlag = "1";
 
     /**
      * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="创建人编号",required=true)
+    @ApiModelProperty(value = "创建人编号", required = true)
     private String createManNo;
 
     /**
      * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
      */
-    @ApiModelProperty(value="创建人姓名",required=true)
+    @ApiModelProperty(value = "创建人姓名", required = true)
     private String createManName;
 
     /**
      * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
+    @ApiModelProperty(value = "创建时间（YYYY-MM-DD HH:mm:SS）", required = true)
     private Date createTime;
 
     /**
      * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="修改人编号",required=false)
+    @ApiModelProperty(value = "修改人编号", required = false)
     private String updateManNo;
 
     /**
      * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
      */
-    @ApiModelProperty(value="修改人姓名",required=false)
+    @ApiModelProperty(value = "修改人姓名", required = false)
     private String updateManName;
 
     /**
      * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    @ApiModelProperty(value = "修改时间（YYYY-MM-DD HH:mm:SS）", required = false)
     private Date updateTime;
 
     /**
      * 是否上传皮卡(IS_UPLOAD,DECIMAL,38)
      */
-    @ApiModelProperty(value="是否上传皮卡",required=true)
+    @ApiModelProperty(value = "是否上传皮卡", required = true)
     private BigDecimal isUpload;
 
     /**
      * 是否分批(IS_INBATCHES,DECIMAL,38)
      */
-    @ApiModelProperty(value="是否分批",required=true)
+    @ApiModelProperty(value = "是否分批", required = true)
     private BigDecimal isInbatches;
 
     /**
      * 是否返粉(IS_RETURNED_DUST,DECIMAL,38)
      */
-    @ApiModelProperty(value="是否返粉",required=true)
+    @ApiModelProperty(value = "是否返粉", required = true)
     private BigDecimal isReturnedDust;
 
     /**
      * 是否焦炭(IS_COKE,DECIMAL,0)
      */
-    @ApiModelProperty(value="是否焦炭",required=true)
+    @ApiModelProperty(value = "是否焦炭", required = true)
     private BigDecimal isCoke;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/service/IDynamicWorkUpdataService.java

@@ -1,11 +1,13 @@
 package com.jisco.dynamicweight.dynamicworkupdata.service;
 
+import com.jisco.dynamicweight.dynamicworkupdata.dto.CokeComputeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.InbatchDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.ReturnedDustDto;
 import com.jisco.dynamicweight.dynamicworkupdata.model.DynamicWorkUpdata;
 import com.jisco.dynamicweight.dynamicworkupdata.vo.AuditDataVO;
 import com.jisco.dynamicweight.dynamicworkupdata.vo.DailyReportVO;
 import com.steerinfo.framework.service.IBaseService;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -13,6 +15,7 @@ import java.util.List;
 
 /**
  * DynamicWorkUpdata服务接口：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2022-01-18 10:14
  * 类描述
@@ -21,10 +24,10 @@ import java.util.List;
  * 作者：generator
  * 参考：
  * 描述：DynamicWorkUpdata服务接口
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
-public interface IDynamicWorkUpdataService extends IBaseService<DynamicWorkUpdata, String>{
+public interface IDynamicWorkUpdataService extends IBaseService<DynamicWorkUpdata, String> {
 
     /**
      * 重新获取动态秤称重数据
@@ -33,41 +36,51 @@ public interface IDynamicWorkUpdataService extends IBaseService<DynamicWorkUpdat
 
     /**
      * 数据分批总重量
-     * @param stationCode
+     *
+     * @param startTime
+     * @param endTime
      * @return
      */
-    BigDecimal inbatchsTotalWeight(String stationCode, Date date);
+    BigDecimal inbatchsTotalWeight(String updataNo, Date startTime, Date endTime);
 
     /**
      * 返粉总重量
-     * @param id
+     *
+     * @param updataNo
+     * @param startTime
+     * @param endTime
      * @return
      */
-    BigDecimal returnedDustWeight(String id);
+    BigDecimal returnedDustWeight(String updataNo, Date startTime, Date endTime);
 
     /**
      * 返粉
-     * @param id
+     *
+     * @param updataNo
+     * @param startTime
+     * @param endTime
      * @param list
      */
-    void returnedDust(String id, List<ReturnedDustDto> list);
+    void returnedDust(String updataNo, Date startTime, Date endTime, List<ReturnedDustDto> list);
 
     /**
      * 数据分批
-     * @param id
+     *
+     * @param updataNo
+     * @param startTime
+     * @param endTime
      * @param list
      */
-    void inbatchs(String id, List<InbatchDto> list);
+    void inbatchs(String updataNo, Date startTime, Date endTime, List<InbatchDto> list);
 
     /**
      * 重新计算焦炭量
-     * @param k
-     * @param list
      */
-    void recalcCoke(BigDecimal k, List<DynamicWorkUpdata> list);
+    void recalcCoke(@RequestBody CokeComputeDto model);
 
     /**
      * 日报表
+     *
      * @param date
      * @return
      */
@@ -75,8 +88,42 @@ public interface IDynamicWorkUpdataService extends IBaseService<DynamicWorkUpdat
 
     /**
      * 查询待审核数据
+     *
      * @param date
      * @return
      */
     List<AuditDataVO> getAuditData(String date);
+
+    /**
+     * 启用
+     *
+     * @param id
+     * @return
+     */
+    boolean disable(String id);
+
+
+    /**
+     * 禁用
+     *
+     * @param id
+     * @return
+     */
+    boolean enable(String id);
+
+    /**
+     * 重新生成数据,删除上传数据表中的数据，并修改采集数据表中的过期标识expire_flag为0，重新生成上传数据表的数据
+     *
+     * @param id
+     * @return
+     */
+    void reGenerate(String id);
+
+    /**
+     * 重新采集数据,删除上传数据表中的数据和采集数据表中的数据，重新采集数据
+     *
+     * @param id
+     * @return
+     */
+    void reCollect(String id);
 }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/service/impl/DynamicWorkUpdataServiceImpl.java

@@ -3,6 +3,10 @@ package com.jisco.dynamicweight.dynamicworkupdata.service.impl;
 import cn.hutool.core.lang.Assert;
 import com.jisco.dynamicweight.dynamicbasebatchstation.mapper.DynamicBaseBatchStationMapper;
 import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
+import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
+import com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData;
+import com.jisco.dynamicweight.dynamicworkdata.service.IDynamicWorkDataService;
+import com.jisco.dynamicweight.dynamicworkupdata.dto.CokeComputeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.InbatchDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.ReturnedDustDto;
 import com.jisco.dynamicweight.dynamicworkupdata.mapper.DynamicWorkUpdataMapper;
@@ -11,22 +15,30 @@ import com.jisco.dynamicweight.dynamicworkupdata.service.IDynamicWorkUpdataServi
 import com.jisco.dynamicweight.dynamicworkupdata.vo.AuditDataVO;
 import com.jisco.dynamicweight.dynamicworkupdata.vo.DailyReportVO;
 import com.jisco.dynamicweight.util.UserUtil;
+import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
+import com.steerinfo.baseinfo.combaseinfo.service.IComBaseInfoService;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * DynamicWorkUpdata服务实现：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2022-01-18 10:14
  * 类描述
@@ -35,8 +47,8 @@ import java.util.*;
  * 作者：generator
  * 参考：
  * 描述：DynamicWorkUpdata服务实现
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @Service(value = "dynamicWorkUpdataService")
 public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpdata, String> implements IDynamicWorkUpdataService {
@@ -44,9 +56,15 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
     @Autowired
     private DynamicWorkUpdataMapper dynamicWorkUpdataMapper;
 
+    @Autowired
+    private IDynamicWorkDataService dynamicWorkDataService;
+
     @Autowired
     private DynamicBaseBatchStationMapper stationMapper;
 
+    @Autowired
+    private IComBaseInfoService comBaseInfoService;
+
     @Override
     protected IBaseMapper<DynamicWorkUpdata, String> getMapper() {
         return dynamicWorkUpdataMapper;
@@ -62,155 +80,204 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
 
     /**
      * 数据分批总重量
-     * @param stationCode
+     *
+     * @param updataNo
      * @return
      */
     @Override
-    public BigDecimal inbatchsTotalWeight(String stationCode, Date date) {
-        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss" );
-        Map<String, Object> params = new HashMap<>();
-        params.put("pikaCode", stationCode);
-        List<DynamicBaseBatchStation> stations = stationMapper.selectByParameters(params);
-        Assert.isTrue(!CollectionUtils.isEmpty(stations), "站点不存在：" + stationCode);
-        Assert.isTrue(stations.size() == 1, "站点存在多条记录：" + stationCode);
-        Date date1 = null;
-        Date date2 = null;
-        try {
-            date1 = sdf.parse(sdf.format(date));
-            date1.setHours(0);
-            date1.setMinutes(0);
-            date1.setSeconds(0);
-            date2 = sdf.parse(sdf.format(date));
-            date2.setHours(23);
-            date2.setMinutes(59);
-            date2.setSeconds(59);
-        } catch (ParseException e) {
-            e.printStackTrace();
-            throw new RuntimeException("日期格式转换错误");
-        }
-        BigDecimal weight = dynamicWorkUpdataMapper.inbatchsTotalWeight(stationCode, date1, date2);
+    public BigDecimal inbatchsTotalWeight(String updataNo, Date startTime, Date endTime) {
+        DynamicWorkUpdata byId = this.getById(updataNo);
+        Assert.notNull(byId, "记录不存在");
+        Assert.notNull(byId.getStationCode(), "记录站点编码为空，无法计算分批总重量");
+        Assert.notNull(byId.getMaterialCode(), "记录物料编码为空，无法计算分批总重量");
+//        Assert.notNull(byId.getEndTime(), "记录结束时间为空，无法计算分批总重量");
+//        Assert.notNull(byId.getStationCode(), "记录所属站点为空，无法计算分批总重量");
+        BigDecimal weight = dynamicWorkUpdataMapper.inbatchsTotalWeight(byId.getStationCode(), byId.getMaterialCode(), startTime, endTime);
         return weight;
     }
 
     /**
      * 返粉总重量
-     * @param id
+     *
+     * @param updataNo
+     * @param startTime
+     * @param endTime
      * @return
      */
     @Override
-    public BigDecimal returnedDustWeight(String id) {
-        DynamicWorkUpdata updata = this.getById(id);
-        Assert.notNull(updata, "记录不存在：" + id);
-        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss" );
-        Date date1 = null;
-        Date date2 = null;
-        try {
-            date1 = sdf.parse(sdf.format(updata.getEndTime()));
-            date1.setHours(0);
-            date1.setMinutes(0);
-            date1.setSeconds(0);
-            date2 = sdf.parse(sdf.format(updata.getEndTime()));
-            date2.setHours(23);
-            date2.setMinutes(59);
-            date2.setSeconds(59);
-        } catch (ParseException e) {
-            e.printStackTrace();
-            throw new RuntimeException("日期格式转换错误");
-        }
-        BigDecimal weight = null;
+    public BigDecimal returnedDustWeight(String updataNo, Date startTime, Date endTime) {
+        DynamicWorkUpdata updata = this.getById(updataNo);
+        Assert.notNull(updata, "记录不存在：" + updataNo);
+        //检查所选记录的物料、站点、收货库房是否是配置表中配置的需要返粉的物料、站点、收货库房
+        //物料
+        List<String> materialCodes = getMaterialCodeForReturnedDust();
+        Assert.isTrue(materialCodes.contains(updata.getMaterialCode()), updata.getMaterialName() + "不能进行返粉");
+        //站点
+        List<String> stationCodes = getStationCodesForReturnedDust();
+        Assert.isTrue(stationCodes.contains(updata.getStationCode()), updata.getStationName() + "不能进行返粉");
+        //收货库房
+        List<String> receiverCodes = getReceiverCodesReturnedDust();
+        Assert.isTrue(receiverCodes.contains(updata.getRecieverCode()), updata.getRecieverName() + "不能进行返粉");
         Map<String, Object> map = new HashMap<>();
-//        if (updata.getMaterialCode() == null) {
-//            updata.setMaterialCode("123123");
-//        }
         map.put("meterialCode", updata.getMaterialCode());
-        map.put("date1", date1);
-        map.put("date2", date2);
-        map.put("weight", weight);
-        dynamicWorkUpdataMapper.returnedDustWeight(map);
-        if (map.get("weight") == null) {
-            map.put("weight", new BigDecimal(0));
-//            weight = new BigDecimal(0);
-        }
-        Assert.isTrue(map.get("weight") !=null,"未获取到重量！");
-        weight = new BigDecimal(map.get("weight").toString());
+        map.put("stationCodes", stationCodes);
+        map.put("receiverCodes", receiverCodes);
+        map.put("startTime", startTime);
+        map.put("endTime", endTime);
+        BigDecimal weight = dynamicWorkUpdataMapper.returnedDustWeight(map);
+        Assert.isTrue(weight != null && weight.compareTo(BigDecimal.ZERO) != 0, "未获取到重量！");
         return weight;
     }
 
+    private List<String> getReceiverCodesReturnedDust() {
+        Map param = new HashedMap();
+        param.put("pBaseCode", "001050003");
+        List<ComBaseInfo> infos = comBaseInfoService.query(param);
+        Assert.isTrue(!CollectionUtils.isEmpty(infos), "未配置返粉收货库房，请检查配置表");
+        List<String> receiverCodes = infos.stream().map(item -> item.getMemo()).collect(Collectors.toList());
+        return receiverCodes;
+    }
+
+    private List<String> getStationCodesForReturnedDust() {
+        Map param = new HashedMap();
+        param.put("pBaseCode", "001050002");
+        List<ComBaseInfo> infos = comBaseInfoService.query(param);
+        Assert.isTrue(!CollectionUtils.isEmpty(infos), "未配置返粉站点，请检查配置表");
+        List<String> stationCodes = infos.stream().map(item -> item.getMemo()).collect(Collectors.toList());
+        return stationCodes;
+    }
+
+    private List<String> getMaterialCodeForReturnedDust() {
+        Map param = new HashedMap();
+        param.put("pBaseCode", "001050001");
+        List<ComBaseInfo> infos = comBaseInfoService.query(param);
+        Assert.isTrue(!CollectionUtils.isEmpty(infos), "未配置返粉物料，请检查配置表");
+        List<String> materialCodes = infos.stream().map(item -> item.getMemo()).collect(Collectors.toList());
+        return materialCodes;
+    }
+
     /**
      * 返粉
-     * @param id
+     *
+     * @param updataNo
+     * @param startTime
+     * @param endTime
      * @param list
      */
     @Transactional
     @Override
-    public void returnedDust(String id, List<ReturnedDustDto> list) {
-        DynamicWorkUpdata updata = this.getById(id);
-        Assert.isTrue( updata !=null && updata.getIsReturnedDust()!=null && updata.getIsReturnedDust().compareTo(new BigDecimal(1))==0, updata.getMaterialName() + "不能进行返粉！");
-        BigDecimal weight = this.returnedDustWeight(id);
-        Assert.isTrue(weight.compareTo(new BigDecimal(0)) > 0, updata.getStationName() + "重量为0,不能进行返粉!");
-        BigDecimal total = new BigDecimal(0);
+    public void returnedDust(String updataNo, Date startTime, Date endTime, List<ReturnedDustDto> list) {
+        //计算返粉总重量，与计算返粉总重量方法代码相同，但是这里需要物料、站点、收货库房信息，为了减少查询数据库次数，这里又复制了一份代码
+        DynamicWorkUpdata updata = this.getById(updataNo);
+        Assert.notNull(updata, "记录不存在：" + updataNo);
+        //检查所选记录的物料、站点、收货库房是否是配置表中配置的需要返粉的物料、站点、收货库房
+        //物料
+        List<String> materialCodes = getMaterialCodeForReturnedDust();
+        Assert.isTrue(materialCodes.contains(updata.getMaterialCode()), updata.getMaterialName() + "不能进行返粉");
+        //站点
+        List<String> stationCodes = getStationCodesForReturnedDust();
+        Assert.isTrue(stationCodes.contains(updata.getStationCode()), updata.getStationName() + "不能进行返粉");
+        //收货库房
+        List<String> receiverCodes = getReceiverCodesReturnedDust();
+        Assert.isTrue(receiverCodes.contains(updata.getRecieverCode()), updata.getRecieverName() + "不能进行返粉");
+        Map<String, Object> map = new HashMap<>();
+        map.put("meterialCode", updata.getMaterialCode());
+        map.put("stationCodes", stationCodes);
+        map.put("receiverCodes", receiverCodes);
+        map.put("startTime", startTime);
+        map.put("endTime", endTime);
+        BigDecimal weight = dynamicWorkUpdataMapper.returnedDustWeight(map);
+        Assert.isTrue(weight != null && weight.compareTo(BigDecimal.ZERO) != 0, "未获取到重量！");
+        BigDecimal total = BigDecimal.ZERO;
+        List<DynamicWorkUpdata> newUpdatas = new ArrayList<>();
         for (ReturnedDustDto returnedDustDto : list) {
             DynamicWorkUpdata data = new DynamicWorkUpdata();
-            BeanUtils.copyProperties(updata, data);
             data.setId(null);
             data.setUpdataNo(null);
-            data.setMaterialCode(returnedDustDto.getMaterialCode());
-            data.setMaterialName(returnedDustDto.getMaterialName());
+            data.setMaterialCode(updata.getMaterialCode());
+            data.setMaterialName(updata.getMaterialName());
             data.setStationCode(returnedDustDto.getStationCode());
             data.setStationName(returnedDustDto.getStationName());
             data.setRecieverCode(returnedDustDto.getRecieverCode());
             data.setRecieverName(returnedDustDto.getRecieverName());
+            data.setSenderCode(updata.getSenderCode());
+            data.setSenderName(updata.getSenderName());
+            data.setSenderType(updata.getSenderType());
             data.setWeight(returnedDustDto.getWeight());
+            data.setStartTime(startTime);
+            data.setEndTime(endTime);
             data.setCreateManNo(UserUtil.getCurrentUserId());
             data.setCreateManName(UserUtil.getCurrentUserName());
             data.setCreateTime(new Date());
             data.setUpdateManNo(null);
             data.setUpdateManName(null);
             data.setUpdateTime(null);
-            this.add(data);
+            newUpdatas.add(data);
             total = total.add(data.getWeight());
         }
-        Assert.isTrue(weight.compareTo(total) == 0, "返粉重量之和与总重量不相等！");
+//        Assert.isTrue(weight.compareTo(total) == 0, "返粉重量之和与总重量不相等！");
+        Assert.isTrue(weight.subtract(total).abs().compareTo(new BigDecimal(1)) < 0, "返粉重量之和与总重量不相等！");
+        dynamicWorkUpdataMapper.disableForReturnedDust(map);
+        this.batchAdd(newUpdatas);
     }
 
     @Transactional
     @Override
-    public void inbatchs(String id, List<InbatchDto> list) {
-        DynamicWorkUpdata updata = this.getById(id);
-        Assert.isTrue(updata.getIsInbatches().compareTo(new BigDecimal(1))==0, updata.getStationName() + "不能进行分批！");
-        BigDecimal weight = this.inbatchsTotalWeight(updata.getStationCode(), updata.getEndTime());
-        Assert.isTrue(weight.compareTo(new BigDecimal(0)) > 0, updata.getStationName() + "重量为0,不能进行分批!");
+    public void inbatchs(String updataNo, Date startTime, Date endTime, List<InbatchDto> list) {
+        BigDecimal weight = this.inbatchsTotalWeight(updataNo, startTime, endTime);
+        Assert.isTrue(weight.compareTo(new BigDecimal(0)) > 0, "重量为0,不能进行分批!");
+        DynamicWorkUpdata updata = this.getById(updataNo);
         BigDecimal total = new BigDecimal(0);
+        List<DynamicWorkUpdata> updataList = new ArrayList<>();
         for (InbatchDto inbatchDto : list) {
             DynamicWorkUpdata data = new DynamicWorkUpdata();
-            BeanUtils.copyProperties(updata, data);
             data.setId(null);
             data.setUpdataNo(null);
+            data.setStationCode(updata.getStationCode());
+            data.setStationName(updata.getStationName());
             data.setMaterialCode(inbatchDto.getMaterialCode());
             data.setMaterialName(inbatchDto.getMaterialName());
+            data.setRecieverCode(updata.getRecieverCode());
+            data.setRecieverName(updata.getRecieverName());
+            data.setRecieverType(updata.getRecieverType());
+            data.setSenderCode(updata.getSenderCode());
+            data.setSenderName(updata.getSenderName());
+            data.setSenderType(updata.getSenderType());
             data.setWeight(inbatchDto.getWeight());
+            data.setStartTime(startTime);
+            data.setEndTime(endTime);
             data.setCreateManNo(UserUtil.getCurrentUserId());
             data.setCreateManName(UserUtil.getCurrentUserName());
             data.setCreateTime(new Date());
-            this.add(data);
+            updataList.add(data);
             total = total.add(data.getWeight());
         }
         Assert.isTrue(weight.compareTo(total) == 0, "分批重量之和与总重量不相等！");
+        int batchAdd = this.batchAdd(updataList);
+        Assert.isTrue(list.size() == batchAdd, "保存分批数据失败");
+        // 作废原数据
+        dynamicWorkUpdataMapper.batchDisable(updata.getStationCode(), updata.getMaterialCode(), startTime, endTime, UserUtil.getCurrentUserId(), UserUtil.getCurrentUserName(), new Date());
     }
 
     /**
      * 重新计算焦炭量
-     * @param k
-     * @param list
      */
     @Transactional
     @Override
-    public void recalcCoke(BigDecimal k, List<DynamicWorkUpdata> list) {
-        for (DynamicWorkUpdata updata : list) {
-            Assert.isTrue(updata.getIsCoke().compareTo(new BigDecimal(1))==0, updata.getMaterialName() + "不是焦炭，不能计算");
-            updata.setWeight(updata.getWeight().multiply(k));
-            dynamicWorkUpdataMapper.updateByPrimaryKey(updata);
+    public void recalcCoke(@RequestBody CokeComputeDto model) {
+        Assert.notNull(model.getDate(), "日期不能为空");
+        Assert.notNull(model.getK(), "系数不能为空");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Map<String, Object> params = new HashMap<>();
+        params.put("endTime1", sdf.format(model.getDate()) + " 00:00:00");
+        params.put("endTime2", sdf.format(model.getDate()) + " 23:59:59");
+        params.put("isCoke", "1");
+        List<DynamicWorkUpdata> updatas = this.dynamicWorkUpdataMapper.selectLikeByParameters(params);
+        BigDecimal k = model.getK();
+        for (DynamicWorkUpdata updata : updatas) {
+            updata.setWeight(updata.getWeight().multiply(k).setScale(2, BigDecimal.ROUND_HALF_UP));
         }
+        dynamicWorkUpdataMapper.batchUpdate(updatas);
     }
 
     @Override
@@ -237,7 +304,7 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
         rzlstart = LocalDateTime.parse(date + " 00:00:00", df);
         rzlend = LocalDateTime.parse(date + " 23:59:59", df);
         yzlstart = LocalDateTime.parse(date + " 00:00:00", df);
-        if (yzlstart.plusMonths(1).withDayOfMonth(1).minusDays(3).isAfter(yzlstart)){
+        if (yzlstart.plusMonths(1).withDayOfMonth(1).minusDays(3).isAfter(yzlstart)) {
             yzlstart = yzlstart.withDayOfMonth(1).minusDays(3);
         } else {
             yzlstart = yzlstart.plusMonths(1).withDayOfMonth(1).minusDays(3);
@@ -253,37 +320,111 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
 
     /**
      * 查询待审核数据
+     *
      * @param date
      * @return
      */
     @Override
     public List<AuditDataVO> getAuditData(String date) {
-        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime bl8start = null;
-        LocalDateTime bl8end = null;
-        LocalDateTime bl16start = null;
-        LocalDateTime bl16end = null;
-        LocalDateTime bl24start = null;
-        LocalDateTime bl24end = null;
-        bl8start = LocalDateTime.parse(date + " 00:00:00", df);
-        bl8end = LocalDateTime.parse(date + " 07:59:59", df);
-        bl16start = LocalDateTime.parse(date + " 08:00:00", df);
-        bl16end = LocalDateTime.parse(date + " 15:59:59", df);
-        bl24start = LocalDateTime.parse(date + " 16:00:00", df);
-        bl24end = LocalDateTime.parse(date + " 23:59:59", df);
+        String bl8start = null;
+        String bl8end = null;
+        String bl16start = null;
+        String bl16end = null;
+        String bl24start = null;
+        String bl24end = null;
+        bl8start = date + " 00:00:00";
+        bl8end = date + " 07:59:59";
+        bl16start = date + " 08:00:00";
+        bl16end = date + " 15:59:59";
+        bl24start = date + " 16:00:00";
+        bl24end = date + " 23:59:59";
         List<AuditDataVO> auditDataVOS = dynamicWorkUpdataMapper.getAuditData(bl8start, bl8end, bl16start, bl16end, bl24start, bl24end);
         for (AuditDataVO auditDataVO : auditDataVOS) {
-            if (Objects.isNull(auditDataVO.getBl8())){
+            if (Objects.isNull(auditDataVO.getBl8())) {
                 auditDataVO.setBl8(BigDecimal.ZERO);
             }
-            if (Objects.isNull(auditDataVO.getBl16())){
+            if (Objects.isNull(auditDataVO.getBl16())) {
                 auditDataVO.setBl16(BigDecimal.ZERO);
             }
-            if (Objects.isNull(auditDataVO.getBl24())){
+            if (Objects.isNull(auditDataVO.getBl24())) {
                 auditDataVO.setBl24(BigDecimal.ZERO);
             }
             auditDataVO.setRzl(auditDataVO.getBl8().add(auditDataVO.getBl16()).add(auditDataVO.getBl24()));
         }
         return auditDataVOS;
     }
+
+    /**
+     * 启用
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean enable(String id) {
+        DynamicWorkUpdata byId = this.getById(id);
+        Assert.notNull(byId, "记录不存在");
+        if (byId.getValidFlag().equals("1")) return false;
+        DynamicWorkUpdata config = new DynamicWorkUpdata();
+        config.setUpdataNo(id);
+        setUpdateManInfo(config);
+        return dynamicWorkUpdataMapper.enable(config) == 1;
+    }
+
+    /**
+     * 禁用
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean disable(String id) {
+        DynamicWorkUpdata byId = this.getById(id);
+        if (byId.getValidFlag() == "0") return false;
+        DynamicWorkUpdata config = new DynamicWorkUpdata();
+        config.setUpdataNo(id);
+        setUpdateManInfo(config);
+        return dynamicWorkUpdataMapper.disable(config) == 1;
+    }
+
+    private void setUpdateManInfo(DynamicWorkUpdata config) {
+        config.setUpdateManNo(UserUtil.getCurrentUserId());
+        config.setUpdateManName(UserUtil.getCurrentUserName());
+        config.setUpdateTime(new Date());
+    }
+
+    /**
+     * 重新生成数据,删除上传数据表中的数据，并修改采集数据表中的过期标识expire_flag为0，重新生成上传数据表的数据
+     *
+     * @param id
+     * @return
+     */
+    @Transactional
+    @Override
+    public void reGenerate(String id) {
+        DynamicWorkUpdata byId = this.getById(id);
+        Assert.notNull(byId, "记录不存在");
+        Assert.isTrue(StringUtils.isNotBlank(byId.getOriginalValue()), "人工添加数据无法重新生成");
+        this.delete(id);
+        DynamicWorkData dynamicWorkData = new DynamicWorkData();
+        dynamicWorkData.setDataNo(byId.getOriginalValue());
+        dynamicWorkData.setExpireFlag("0");
+        dynamicWorkDataService.modify(dynamicWorkData);
+    }
+
+    /**
+     * 重新采集数据,删除上传数据表中的数据和采集数据表中的数据，重新采集数据
+     *
+     * @param id
+     * @return
+     */
+    @Transactional
+    @Override
+    public void reCollect(String id) {
+        DynamicWorkUpdata byId = this.getById(id);
+        Assert.notNull(byId, "记录不存在");
+        Assert.isTrue(StringUtils.isNotBlank(byId.getOriginalValue()), "人工添加数据无法重新生成");
+        this.delete(id);
+        dynamicWorkDataService.delete(byId.getOriginalValue());
+    }
 }

src/main/java/com/jisco/dynamicweight/pika/mapper/CenternetMapper.java

@@ -4,6 +4,9 @@ import com.jisco.dynamicweight.pika.model.Centernet;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface CenternetMapper extends IBaseMapper<Centernet, String> {
+    void cancelUpload(List<Centernet> centernets);
 }

src/main/java/com/jisco/dynamicweight/pika/mapper/CenternetMapper.xml

@@ -85,7 +85,7 @@
     <sql id="columns_alias">
         t
         .
-        Identity
+        "Identity"
         , t.MeasureBill, t.TrustBillNum, t.VoucherIdentity, t.VoucherItem, t.BusinessGroup,
     t.BusinessType, t.StationType, t.MeasureObjectType, t.Conveyance, t.Trailer, t.TempConveyance, 
     t.ConveyanceGroup, t.ConveyanceType, t.ResourceSystem, t.GroupPackageAmount, t.GroupPackageUnit, 
@@ -112,7 +112,7 @@
     <sql id="where">
         <where>
             <if test="identity != null and identity != ''">
-                and Identity = #{identity}
+                and "Identity" = #{identity}
             </if>
             <if test="measurebill != null and measurebill != ''">
                 and MeasureBill = #{measurebill}
@@ -311,7 +311,7 @@
     <sql id="whereLike">
         <where>
             <if test="identity != null and identity != ''">
-                and Identity LIKE '%${identity}%'
+                and "Identity" LIKE '%${identity}%'
             </if>
             <if test="measurebill != null and measurebill != ''">
                 and MeasureBill LIKE '%${measurebill}%'
@@ -510,7 +510,7 @@
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
         delete
         from jgshared."CenterNet"@PIKATEST
-        where Identity = #{identity,jdbcType=VARCHAR}
+        where "Identity" = #{identity,jdbcType=VARCHAR}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
         delete from jgshared."CenterNet"@PIKATEST
@@ -807,7 +807,7 @@
         insert into jgshared."CenterNet"@PIKATEST
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="identity != null">
-                Identity,
+                "Identity",
             </if>
             <if test="measurebill != null">
                 MeasureBill,
@@ -2413,5 +2413,13 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
+    <!--    撤销上传-->
+<!--    <delete id="batchDelete" parameterType="java.util.List">-->
+<!--        update jgshared."CenterNet"@PIKATEST-->
+<!--        set Delete-->
+<!--        where "Identity" in-->
+<!--        <foreach collection="list" item="id" open="(" close=")" separator=",">-->
+<!--            #{id}-->
+<!--        </foreach>-->
+<!--    </delete>-->
 </mapper>

src/main/java/com/jisco/dynamicweight/pika/service/ICenternetService.java

@@ -23,5 +23,5 @@ public interface ICenternetService extends IBaseService<Centernet, String>{
 
     void upload(List<DynamicWorkAuditdata> list);
 
-    void cancelUpload(List<DynamicWorkAuditdata> list);
+    void cancelUpload(List<String> list);
 }

src/main/java/com/jisco/dynamicweight/pika/service/impl/CenternetServiceImpl.java

@@ -8,14 +8,17 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Centernet服务实现：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2022-02-11 11:33
  * 类描述
@@ -24,8 +27,8 @@ import java.util.List;
  * 作者：generator
  * 参考：
  * 描述：Centernet服务实现
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @Service(value = "centernetService")
 public class CenternetServiceImpl extends BaseServiceImpl<Centernet, String> implements ICenternetService {
@@ -69,20 +72,36 @@ public class CenternetServiceImpl extends BaseServiceImpl<Centernet, String> imp
             centernet.setMeasurebatch(null);
             centernet.setMeasurebatchcount(null);
             centernet.setMeasuretasknum(null);
-            switch (item.getSenderType()){
-                case "部门":centernet.setSendertype("Department");break;
-                case "库存地": centernet.setSendertype("Storeroom");break;
-                case "企业（公司）":centernet.setSendertype("Enterprise");break;
-                default:centernet.setSendertype("");;
+            switch (item.getSenderType()) {
+                case "部门":
+                    centernet.setSendertype("Department");
+                    break;
+                case "库存地":
+                    centernet.setSendertype("Storeroom");
+                    break;
+                case "企业（公司）":
+                    centernet.setSendertype("Enterprise");
+                    break;
+                default:
+                    centernet.setSendertype("");
+                    ;
             }
             centernet.setSendername(item.getSenderName());
             centernet.setSender(item.getSenderCode());
             centernet.setSenderremark(null);
-            switch (item.getRecieverType()){
-                case "部门":centernet.setReceivertype("Department");break;
-                case "库存地": centernet.setReceivertype("Storeroom");break;
-                case "企业（公司）":centernet.setReceivertype("Enterprise");break;
-                default:centernet.setReceivertype("");;
+            switch (item.getRecieverType()) {
+                case "部门":
+                    centernet.setReceivertype("Department");
+                    break;
+                case "库存地":
+                    centernet.setReceivertype("Storeroom");
+                    break;
+                case "企业（公司）":
+                    centernet.setReceivertype("Enterprise");
+                    break;
+                default:
+                    centernet.setReceivertype("");
+                    ;
             }
             centernet.setReceivername(item.getRecieverName());
             centernet.setReceiver(item.getRecieverCode());
@@ -124,13 +143,13 @@ public class CenternetServiceImpl extends BaseServiceImpl<Centernet, String> imp
     }
 
     @Override
-    public void cancelUpload(List<DynamicWorkAuditdata> list) {
+    public void cancelUpload(List<String> list) {
         List<Centernet> centernets = new ArrayList<>();
-        for (DynamicWorkAuditdata auditdata : list) {
-            Centernet centernet = this.getById(auditdata.getPikaDataId());
-            centernet.setDeletedtag("Y");
-            centernets.add(centernet);
-        }
-        this.batchUpdate(centernets);
+//        for (DynamicWorkAuditdata auditdata : list) {
+//            Centernet centernet = this.getById(auditdata.getPikaDataId());
+//            centernet.setDeletedtag("Y");
+//            centernets.add(centernet);
+//        }
+        centernetMapper.batchDelete(list);
     }
 }

src/main/java/com/jisco/dynamicweight/util/UserUtil.java

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils;
 public class UserUtil {
     public static String getCurrentUserId(){
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
 
 
         return userId;

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -168,15 +168,11 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
+    @ApiOperation(value = "获取列表", notes = "不分页分页模糊查询")
     @PostMapping(value = "/likeByValueFlag/")
-    public RESTfulResult likeByValueFlag(@RequestBody HashMap params, Integer pageNum, Integer pageSize) {
+    public RESTfulResult likeByValueFlag(@RequestBody HashMap params) {
         try {
-            PageList<MeterWorkCarActual> list = meterWorkCarActualService.likeByDesc(params, pageNum, pageSize);
+            List<MeterWorkCarActual> list = meterWorkCarActualService.likeByValueFlag(params);
             return success(list);
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -94,6 +94,7 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
     RESTfulResult firstAndEntrustById(String actualNo);
 
     PageList<MeterWorkCarActual> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
+    List<MeterWorkCarActual> likeByValueFlag(HashMap<String, Object> params);
 
     RESTfulResult abolish(List<MeterWorkCarActual> models);
 

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -1261,6 +1261,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         return pageInfo;
     }
 
+    @Override
+    public List<MeterWorkCarActual> likeByValueFlag(HashMap<String, Object> params) {
+        if(params.get("netSpot3NoStr") != null) {
+            String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
+        List<MeterWorkCarActual> rows = meterWorkCarActualMapper.likeByDesc(params);
+        return rows;
+    }
+
     @Override
     public RESTfulResult abolish(List<MeterWorkCarActual> models) {
         RESTfulResult rm = new RESTfulResult();