3533 主数据表设计与开发（容器条码与站点关系表-接口变更）

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesContainerSnStationService.java

@@ -19,10 +19,6 @@ public interface IMesContainerSnStationService {
 
     void doInsert(MesContainerSnStation mesContainerSnStation, String userName);
 
-    void doUpdate(MesContainerSnStation mesContainerSnStation, String userName);
-
-    void doUpdateIsValid(List<Long> idList, Integer status, String organizeCode, String userName);
-
     void deleteWeaklyByIds(List<Long> idList, String organizeCode, String userName);
 
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java

@@ -2,9 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.base;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesContainerSnStationService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnStation;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -64,53 +62,13 @@ public class MesContainerSnStationController {
         }
     }
 
-    @PostMapping("/update")
+    @DeleteMapping(value = "/delete-weakly")
-    @ApiOperation(value = "编辑")
-    public ResultBean doUpdate(@RequestBody MesContainerSnStation mesContainerSnStation) {
-        try {
-            String userName = AuthUtil.getSessionUser().getUserName();
-            ValidatorBean.checkNotNull(mesContainerSnStation.getOrganizeCode(), "工厂代码为空");
-            mesContainerSnStationService.doUpdate(mesContainerSnStation, userName);
-            return ResultBean.success("编辑成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        } catch (ImppBusiException imppException) {
-            return ResultBean.fail(imppException);
-        } catch (Exception e) {
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @PutMapping("/update-isValid-by-id")
-    @ApiOperation(value = "批量根据id启用或禁用")
-    public ResultBean doUpdateIsValid(Long[] idList, Integer isValid, String organizeCode) {
-        try {
-            ValidatorBean.checkNotNull(organizeCode, "工厂代码为空");
-            ValidatorBean.checkNotNull(idList, "请选择需要删除的信息");
-            List<Long> ids = Arrays.asList(idList);
-            if (isValid != CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() &&
-                    isValid != CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
-                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                        .setErrorDetail("状态值不符合要求，不允许操作").
-                        build();
-            }
-            String userName = AuthUtil.getSessionUser().getUserName();
-            mesContainerSnStationService.doUpdateIsValid(ids, isValid, organizeCode, userName);
-            return ResultBean.success("批量根据id启用或禁用成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        } catch (ImppBusiException imppException) {
-            return ResultBean.fail(imppException);
-        } catch (Exception e) {
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
-    }
-
-    @PutMapping(value = "/delete-weakly")
     @ApiOperation(value = "批量软删除信息")
-    public ResultBean batchDeleteWeaklyByIds(@RequestBody Long[] idList, String organizeCode) {
+    public ResultBean batchDeleteWeaklyByIds(@RequestBody Long[] idList) {
         try {
             ValidatorBean.checkNotNull(idList, "请选择需要删除的信息");
-            ValidatorBean.checkNotNull(organizeCode, "工厂代码为空");
             List<Long> ids = Arrays.asList(idList);
+            String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
             String userName = AuthUtil.getSessionUser().getUserName();
             mesContainerSnStationService.deleteWeaklyByIds(ids, organizeCode, userName);
             return ResultBean.success("批量删除信息成功")

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesContainerSnStationServiceImpl.java

@@ -73,22 +73,6 @@ public class MesContainerSnStationServiceImpl implements IMesContainerSnStationS
     }
 
     @Override
-    public void doUpdate(MesContainerSnStation mesContainerSnStation, String userName) {
-        ConvertBean.saveOrUpdate(mesContainerSnStation, userName);
-        mesContainerSnStationRepository.update(mesContainerSnStation);
-    }
-
-    @Override
-    public void doUpdateIsValid(List<Long> idList, Integer status, String organizeCode, String userName) {
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getInPackList(idList, "id", ddlPackBean);
-        mesContainerSnStationRepository.updateByProperties(
-                new String[]{"modifyUser", "modifyDatetime", "isValid"},
-                new Object[]{userName, TimeTool.getNowTime(true), status },
-                ddlPackBean);
-    }
-
-    @Override
     public void deleteWeaklyByIds(List<Long> idList, String organizeCode, String userName) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getInPackList(idList, "id", ddlPackBean);