zhanghonglin
2025-08-04 10775e2b00cee12fb4b405e18a507c629990051a
新增切换库位与切换货物状态功能

新增切换库位与切换货物状态功能
已修改10个文件
684 ■■■■ 文件已修改
项目代码/WCS/WIDESEAWCS_Client/src/views/wmsPart/locationimg.vue 184 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Client/src/views/wmsPart/stockInfo.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json 80 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_IWMSPart/ILocationInfoService.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/WMSPart/Dt_StockInfo.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMSPart/LocationInfoController.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs 273 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/StockInfoService.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Client/src/views/wmsPart/locationimg.vue
@@ -989,6 +989,13 @@
      </div>
    </div>
    <div id="kuang">
      <div id="qiehuan">
        <div class="qiean" @click="qiehuan(4)"></div>
        <div class="qiean" @click="qiehuan(3)"></div>
        <div class="qiean" @click="qiehuan(2)"></div>
        <div class="qiean" @click="qiehuan(1)"></div>
        <div class="qiean" @click="baohu()" style="background-color: green;">X</div>
      </div>
      <div id="ti">
        <div class="ge" id="a" style="width: 6%;height:60%;margin-top: 1%;margin-left: 1%;"></div>
        <div class="wen">空闲</div>
@@ -1024,6 +1031,7 @@
const weis = ref("");
const swei = ref("");
const lie = ref("");
const bao = ref(0);
const qu = ref(0);
const ji = ref(0);
@@ -1039,6 +1047,36 @@
const store = useStore();
const data = ref({});
//修改库位保护按钮
const baohu = k => {
  bao.value = 0;
  let t = document.getElementsByClassName("qiean");
  t[4].style.background = "green";
  alert("取消成功");
};
//切换库位
const qiehuan = k => {
  let t = document.getElementsByClassName("qiean");
  if (bao.value == 0) {
    bao.value = 1;
    alert("已激活修改库位");
    t[4].style.background = "red";
  } else {
    axios.post("api/LocationInfo/setlocations/?k=" + k, {}).then(x => {
      if (x.data.message == 1) {
        alert("修改成功");
      } else if (x.data.message == 2) {
        alert("库存里有货,无法修改");
      } else if (x.data.message == 4) {
        alert("修改失败");
      }
      bao.value = 0;
      t[4].style.background = "green";
    });
  }
};
//出库
const kc = () => {
  let t = document.getElementById("zxj");
@@ -1047,58 +1085,51 @@
  if (wei.value != "") {
    //普通货半自动出库
    if (ji.value == 1) {
      //判断列
      if (lie.value < 37) {
        //data.value.R_ZXJ_isWork == true &&
        if (R_ZXJ_TCMode.value == true && R_HC_isReadyWork.value == true) {
          axios
            .post(
              "api/Task/banzidong/?wei=" + wei.value + "&weis=" + weis.value,
              {}
            )
            .then(x => {
              qu.value = 0;
              t.style.background = "#f60";
              if (x.data.message == 1) {
                alert("出库失败(可能是 â€œæ˜¯å¦å‡ºåº“” çš„问题)");
              } else if (x.data.message == 3) {
                alert("出库失败(找不到库存)");
              } else {
                alert("出库成功");
              }
              console.log(x);
            });
        } else {
          alert("信号不正确");
        }
      //data.value.R_ZXJ_isWork == true &&
      if (R_ZXJ_TCMode.value == true && R_HC_isReadyWork.value == true) {
      axios
        .post(
          "api/Task/banzidong/?wei=" + wei.value + "&weis=" + weis.value,
          {}
        )
        .then(x => {
          qu.value = 0;
          t.style.background = "#f60";
          if (x.data.message == 1) {
            alert("出库失败(可能是 â€œæ˜¯å¦å‡ºåº“” çš„问题)");
          } else if (x.data.message == 3) {
            alert("出库失败(找不到库存)");
          } else if (x.data.message == 5) {
            alert("普通出库无法选中剔除库位");
          } else {
            alert("出库成功");
          }
        });
      } else {
        alert("普通出库不能选中38列的库");
        alert("信号不正确");
      }
      //剔除货半自动出库
    } else if (ji1.value == 1) {
      //判断列
      if (lie.value >= 37) {
        //判断信号////////////////////////////////////////////////////////////////////////////////
        if (R_TC_isready.value == true) {
          axios.post("api/Task/tichuchuku/?wei=" + wei.value, {}).then(x => {
            qu1.value = 0;
            s.style.background = "#f60";
            if (x.data.message == 1) {
              alert("出库失败(可能是 â€œæ˜¯å¦å‡ºåº“” çš„问题)");
            } else if (x.data.message == 2) {
              alert("出库成功");
            } else if (x.data.message == 3) {
              alert("出库失败");
            } else if (x.data.message == 4) {
              alert("库存里面无货");
            }
          });
        }else{
          alert("信号不正确");
      //判断信号////////////////////////////////////////////////////////////////////////////////
      if (R_TC_isready.value == true) {
      axios.post("api/Task/tichuchuku/?wei=" + wei.value, {}).then(x => {
        qu1.value = 0;
        s.style.background = "#f60";
        if (x.data.message == 1) {
          alert("出库失败(可能是 â€œæ˜¯å¦å‡ºåº“” çš„问题)");
        } else if (x.data.message == 2) {
          alert("出库成功");
        } else if (x.data.message == 3) {
          alert("出库失败");
        } else if (x.data.message == 4) {
          alert("库存里面无货");
        } else if (x.data.message == 5) {
          alert("剔除出库无法选中普通库位");
        }
      });
      } else {
        alert("普通出库只能选中38列的库");
        alert("信号不正确");
      }
    }
    //剔除直接出库
@@ -1128,29 +1159,29 @@
  }
};
//入库
//剔除入库
const kr = () => {
  let t = document.getElementById("zxj");
  if (ji.value == 1 && wei.value != "") {
    if (lie.value >= 37) {
      //判断信号////////////////////////////////////////////////////////////////////////////////
      if (R_ZXJ_TC_isready.value == true && R_TCMode_TC.value == true) {
        axios.post("api/Task/tichuruku/?wei=" + wei.value, {}).then(x => {
          qu.value = 0;
          t.style.background = "#f60";
          if (x.data.message == 1) {
            alert("入库失败(可能是 â€œæ˜¯å¦å‡ºåº“” çš„问题)");
          } else if (x.data.message == 2) {
            alert("入库成功");
          } else if (x.data.message == 3) {
            alert("入库失败");
          } else if (x.data.message == 4) {
            alert("库存里面已有货");
          }
        });
      }
    //判断信号////////////////////////////////////////////////////////////////////////////////
    if (R_ZXJ_TC_isready.value == true && R_TCMode_TC.value == true) {
      axios.post("api/Task/tichuruku/?wei=" + wei.value, {}).then(x => {
        qu.value = 0;
        t.style.background = "#f60";
        if (x.data.message == 1) {
          alert("入库失败(可能是 â€œæ˜¯å¦å‡ºåº“” çš„问题)");
        } else if (x.data.message == 2) {
          alert("入库成功");
        } else if (x.data.message == 3) {
          alert("入库失败");
        } else if (x.data.message == 4) {
          alert("库存里面已有货");
        } else if (x.data.message == 5) {
          alert("剔除入库必须选择剔除库位");
        }
      });
    } else {
      alert("剔除入库只能选中38列的库");
      alert("信号不正确");
    }
  } else {
    alert("请先选中库位和整形机");
@@ -1312,6 +1343,27 @@
</script>
<style scoped>
.qiean {
  width: 15%;
  height: 70%;
  border: 1px solid green;
  float: left;
  margin-left: 5%;
  text-align: center;
  line-height: 3vh;
  font-size: 2vh;
}
.qiean:hover {
  border: 2px solid yellow;
}
#qiehuan {
  width: 13%;
  height: 5%;
  position: absolute;
  left: 85.7%;
  top: 71%;
  cursor: pointer;
}
#kr {
  width: 4%;
  height: 4%;
@@ -1334,7 +1386,7 @@
  width: 10%;
  height: 15%;
  position: absolute;
  top: 75%;
  top: 80%;
  left: 87%;
  text-align: center;
  line-height: 700%;
@@ -1371,7 +1423,7 @@
  width: 10%;
  height: 15%;
  position: absolute;
  top: 75%;
  top: 80%;
  left: 2%;
  text-align: center;
  line-height: 700%;
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Client/src/views/wmsPart/stockInfo.vue
@@ -25,25 +25,26 @@
      url: "/StockInfo/",
      sortName: "id"
    });
    const editFormFields = ref({
      deviceCode: "",
      deviceName: "",
      deviceType: "",
      deviceStatus: "",
      deviceIp: "",
      devicePort: "",
      devicePlcType: "",
      deviceRemark: ""
    });
    const editFormFields = ref({});
    const editFormOptions = ref([
      [
        { field: "palletCode", title: "托盘编号", type: "string" },
        { field: "locationCode", title: "货位编号", type: "string" }
        {
          title: "物料信息",
          field: "remark",
          type: "select",
          dataKey: "mateType",
        },
        {
          title: "库存状态",
          field: "stockStatus",
          type: "select",
          dataKey: "stock",
        }
      ]
    ]);
    const searchFormFields = ref({
      palletCode: "",
      locationCode: ""
      remark: "",
      stockStatus: ""
    });
    const searchFormOptions = ref([
      [
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json
@@ -7,14 +7,6 @@
      "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
      "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
@@ -23,8 +15,16 @@
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}|WIDESEAWCS_WMSPart\\WIDESEAWCS_WMSPart.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_wmspart\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}|WIDESEAWCS_WMSPart\\WIDESEAWCS_WMSPart.csproj|solutionrelative:wideseawcs_wmspart\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    }
  ],
  "DocumentGroupContainers": [
@@ -42,28 +42,29 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "Title": "appsettings.json",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
              "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json",
              "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
              "WhenOpened": "2025-07-17T08:36:45.301Z",
              "DocumentIndex": 5,
              "Title": "LocationEnum.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs",
              "RelativeToolTip": "WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAswAwAAAAQAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-29T06:28:32.954Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "Title": "TaskStatusEnum.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs",
              "RelativeToolTip": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs",
              "ViewState": "AgIAAI4AAAAAAAAAAAAqwJAAAAAcAAAAAAAAAA==",
              "DocumentIndex": 4,
              "Title": "LocationInfoService.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\LocationInfoService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_WMSPart\\LocationInfoService.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\LocationInfoService.cs",
              "RelativeToolTip": "WIDESEAWCS_WMSPart\\LocationInfoService.cs",
              "ViewState": "AgIAAPkBAAAAAAAAAAAowPwBAAARAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-01T13:03:23.848Z"
              "WhenOpened": "2025-07-29T06:20:23.748Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
@@ -73,46 +74,49 @@
              "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "ViewState": "AgIAAI8AAAAAAAAAAAAswAEGAAAjAAAAAAAAAA==",
              "ViewState": "AgIAAOsDAAAAAAAAAAAvwP0DAAAMAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-19T02:06:47.617Z",
              "WhenOpened": "2025-07-24T08:17:28.019Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "DocumentIndex": 1,
              "Title": "GZJJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "ViewState": "AgIAAL0AAAAAAAAAAAAswPoAAAAhAAAAAAAAAA==",
              "ViewState": "AgIAALQAAAAAAAAAAAD4v78AAAAYAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-16T07:03:59.279Z"
              "WhenOpened": "2025-05-16T07:03:59.279Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "DocumentIndex": 2,
              "Title": "OHTJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ViewState": "AgIAAA8AAAAAAAAAAAAAAOcAAAAoAAAAAAAAAA==",
              "ViewState": "AgIAAD8AAAAAAAAAAAAYwOcAAAAoAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-16T07:49:36.171Z"
              "WhenOpened": "2025-05-16T07:49:36.171Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "DocumentIndex": 3,
              "Title": "ZXJJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAC8AAAAaAAAAAAAAAA==",
              "ViewState": "AgIAALkAAAAAAAAAAAAhwOEAAAAuAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-04-03T02:04:31.648Z"
              "WhenOpened": "2025-04-03T02:04:31.648Z",
              "EditorCaption": ""
            }
          ]
        }
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json
@@ -11,24 +11,20 @@
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
      "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
      "AbsoluteMoniker": "D:0:0:{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}|WIDESEAWCS_WMSPart\\WIDESEAWCS_WMSPart.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_wmspart\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}|WIDESEAWCS_WMSPart\\WIDESEAWCS_WMSPart.csproj|solutionrelative:wideseawcs_wmspart\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
      "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    }
  ],
  "DocumentGroupContainers": [
@@ -38,7 +34,7 @@
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "SelectedChildIndex": 4,
          "SelectedChildIndex": 3,
          "Children": [
            {
              "$type": "Bookmark",
@@ -46,41 +42,29 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "DocumentIndex": 5,
              "Title": "LocationEnum.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs",
              "RelativeToolTip": "WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs",
              "ViewState": "AgIAACMAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAA==",
              "ViewState": "AgIAAAAAAAAAAAAAAAAswAwAAAAQAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-23T05:22:53.555Z",
              "WhenOpened": "2025-07-29T06:28:32.954Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "Title": "appsettings.json",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
              "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
              "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json",
              "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
              "WhenOpened": "2025-07-17T08:36:45.301Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 6,
              "Title": "TaskStatusEnum.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs",
              "RelativeToolTip": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs",
              "ViewState": "AgIAAI4AAAAAAAAAAAAqwJAAAAAcAAAAAAAAAA==",
              "DocumentIndex": 4,
              "Title": "LocationInfoService.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\LocationInfoService.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_WMSPart\\LocationInfoService.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\LocationInfoService.cs",
              "RelativeToolTip": "WIDESEAWCS_WMSPart\\LocationInfoService.cs",
              "ViewState": "AgIAAPkBAAAAAAAAAAAowPwBAAARAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-01T13:03:23.848Z"
              "WhenOpened": "2025-07-29T06:20:23.748Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
@@ -90,9 +74,9 @@
              "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
              "ViewState": "AgIAALoFAAAAAAAAAAAMwP0DAAAMAAAAAAAAAA==",
              "ViewState": "AgIAAOsDAAAAAAAAAAAvwP0DAAAMAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-19T02:06:47.617Z",
              "WhenOpened": "2025-07-24T08:17:28.019Z",
              "EditorCaption": ""
            },
            {
@@ -103,34 +87,36 @@
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs",
              "ViewState": "AgIAAFsBAAAAAAAAAAAjwAgBAAAYAAAAAAAAAA==",
              "ViewState": "AgIAALQAAAAAAAAAAAD4v78AAAAYAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-16T07:03:59.279Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "DocumentIndex": 2,
              "Title": "OHTJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs",
              "ViewState": "AgIAAA8AAAAAAAAAAAAAAOcAAAAoAAAAAAAAAA==",
              "ViewState": "AgIAAD8AAAAAAAAAAAAYwOcAAAAoAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-16T07:49:36.171Z"
              "WhenOpened": "2025-05-16T07:49:36.171Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "DocumentIndex": 3,
              "Title": "ZXJJob.cs",
              "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "RelativeToolTip": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAAAAAC8AAAAaAAAAAAAAAA==",
              "ViewState": "AgIAALkAAAAAAAAAAAAhwOEAAAAuAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-04-03T02:04:31.648Z"
              "WhenOpened": "2025-04-03T02:04:31.648Z",
              "EditorCaption": ""
            }
          ]
        }
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_IWMSPart/ILocationInfoService.cs
@@ -28,5 +28,7 @@
        /// <param name="InMode"></param>
        /// <returns></returns>
        Dt_LocationInfo GetInLocation(int InMode);
        WebResponseContent setlocations(int k);
    }
}
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/WMSPart/Dt_StockInfo.cs
@@ -23,13 +23,13 @@
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "批次号")]
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "批次号")]
        public string BatchNo { get; set; }
        /// <summary>
        /// é‡é‡
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "重量")]
        [SugarColumn(IsNullable = true, ColumnDescription = "重量")]
        public decimal Weight { get; set; }
        /// <summary>
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMSPart/LocationInfoController.cs
@@ -49,5 +49,11 @@
        {
            return Service.getlocation();
        }
        [HttpPost, Route("setlocations"), AllowAnonymous]
        public WebResponseContent setlocations(int k)
        {
            return Service.setlocations(k);
        }
    }
}
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -1357,6 +1357,11 @@
                //{
                //    throw new Exception($"整形机天车放板信号为false");
                //}
                var location = _locationRepository.QueryFirst(v => v.LocationCode == wei);
                if (location.LocationType != (int)LocationTypeEnum.Flat)
                {
                    return content.OK("5");
                }
                //查询当前任务池中是否存在出库任务,出库任务只能存在一条
                var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
                if (oldtask != null)
@@ -1454,11 +1459,15 @@
            //{
            //    throw new Exception($"规整机剔除架子可放板或剔除上料模式信号为false");
            //}
            //查询当前任务池中是否存在出库任务,出库任务只能存在一条
            var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
            var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
            if (isout.isout == 0)
            {
                var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
                var location = _locationRepository.QueryFirst(v => v.LocationCode == wei);
                if(location.LocationType != (int)LocationTypeEnum.Cube)
                {
                    return content.OK("5");
                }
                if (oldtask != null)
                {
                    throw new Exception($"当前任务池中已存在一条出库任务");
@@ -1517,6 +1526,11 @@
            var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
            if (isout.isout == 0)
            {
                var location = _locationRepository.QueryFirst(v => v.LocationCode == wei);
                if (location.LocationType != (int)LocationTypeEnum.Cube)
                {
                    return content.OK("5");
                }
                //判断库存是否有货
                //查询货位
                Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei);
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs
@@ -295,6 +295,279 @@
            }
        }
        public WebResponseContent setlocations(int k)
        {
            WebResponseContent content = new WebResponseContent();
            if (k == 1)
            {
                List<Dt_LocationInfo> ben = BaseDal.QueryData(v => v.Id<=2537&&v.Id>=2526);
                //判断是否有货
                if (ben[0].LocationStatus == (int)LocationStatusEnum.InStock || ben[1].LocationStatus == (int)LocationStatusEnum.InStock || ben[2].LocationStatus == (int)LocationStatusEnum.InStock || ben[3].LocationStatus == (int)LocationStatusEnum.InStock || ben[4].LocationStatus == (int)LocationStatusEnum.InStock || ben[5].LocationStatus == (int)LocationStatusEnum.InStock || ben[6].LocationStatus == (int)LocationStatusEnum.InStock || ben[7].LocationStatus == (int)LocationStatusEnum.InStock || ben[8].LocationStatus == (int)LocationStatusEnum.InStock || ben[9].LocationStatus == (int)LocationStatusEnum.InStock || ben[10].LocationStatus == (int)LocationStatusEnum.InStock || ben[11].LocationStatus == (int)LocationStatusEnum.InStock)
                {
                    return content.OK("2");
                }
                //剔除改成正常
                if (ben[0].LocationType == (int)LocationTypeEnum.Cube)
                {
                    ben[0].LocationType = (int)LocationTypeEnum.Flat;
                    ben[1].LocationType = (int)LocationTypeEnum.Flat;
                    ben[1].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[2].LocationType = (int)LocationTypeEnum.Flat;
                    ben[3].LocationType = (int)LocationTypeEnum.Flat;
                    ben[3].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[4].LocationType = (int)LocationTypeEnum.Flat;
                    ben[5].LocationType = (int)LocationTypeEnum.Flat;
                    ben[5].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[6].LocationType = (int)LocationTypeEnum.Flat;
                    ben[7].LocationType = (int)LocationTypeEnum.Flat;
                    ben[7].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[8].LocationType = (int)LocationTypeEnum.Flat;
                    ben[9].LocationType = (int)LocationTypeEnum.Flat;
                    ben[9].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[10].LocationType = (int)LocationTypeEnum.Flat;
                    ben[11].LocationType = (int)LocationTypeEnum.Flat;
                    ben[11].EnableStatus = (int)EnableStatusEnum.Normal;
                    BaseDal.UpdateData(ben);
                    return content.OK("1");
                }
                //正常改成剔除
                else
                {
                    ben[0].LocationType = (int)LocationTypeEnum.Cube;
                    ben[1].LocationType = (int)LocationTypeEnum.Cube;
                    ben[1].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[2].LocationType = (int)LocationTypeEnum.Cube;
                    ben[3].LocationType = (int)LocationTypeEnum.Cube;
                    ben[3].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[4].LocationType = (int)LocationTypeEnum.Cube;
                    ben[5].LocationType = (int)LocationTypeEnum.Cube;
                    ben[5].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[6].LocationType = (int)LocationTypeEnum.Cube;
                    ben[7].LocationType = (int)LocationTypeEnum.Cube;
                    ben[7].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[8].LocationType = (int)LocationTypeEnum.Cube;
                    ben[9].LocationType = (int)LocationTypeEnum.Cube;
                    ben[9].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[10].LocationType = (int)LocationTypeEnum.Cube;
                    ben[11].LocationType = (int)LocationTypeEnum.Cube;
                    ben[11].EnableStatus = (int)EnableStatusEnum.Disable;
                    BaseDal.UpdateData(ben);
                    return content.OK("1");
                }
            }
            else if (k == 2)
            {
                List<Dt_LocationInfo> ben = BaseDal.QueryData(v => v.Id <= 2515 && v.Id >= 2504);
                //判断是否有货
                if (ben[0].LocationStatus == (int)LocationStatusEnum.InStock || ben[1].LocationStatus == (int)LocationStatusEnum.InStock || ben[2].LocationStatus == (int)LocationStatusEnum.InStock || ben[3].LocationStatus == (int)LocationStatusEnum.InStock || ben[4].LocationStatus == (int)LocationStatusEnum.InStock || ben[5].LocationStatus == (int)LocationStatusEnum.InStock || ben[6].LocationStatus == (int)LocationStatusEnum.InStock || ben[7].LocationStatus == (int)LocationStatusEnum.InStock || ben[8].LocationStatus == (int)LocationStatusEnum.InStock || ben[9].LocationStatus == (int)LocationStatusEnum.InStock || ben[10].LocationStatus == (int)LocationStatusEnum.InStock || ben[11].LocationStatus == (int)LocationStatusEnum.InStock)
                {
                    return content.OK("2");
                }
                //剔除改成正常
                if (ben[0].LocationType == (int)LocationTypeEnum.Cube)
                {
                    ben[0].LocationType = (int)LocationTypeEnum.Flat;
                    ben[1].LocationType = (int)LocationTypeEnum.Flat;
                    ben[1].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[2].LocationType = (int)LocationTypeEnum.Flat;
                    ben[3].LocationType = (int)LocationTypeEnum.Flat;
                    ben[3].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[4].LocationType = (int)LocationTypeEnum.Flat;
                    ben[5].LocationType = (int)LocationTypeEnum.Flat;
                    ben[5].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[6].LocationType = (int)LocationTypeEnum.Flat;
                    ben[7].LocationType = (int)LocationTypeEnum.Flat;
                    ben[7].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[8].LocationType = (int)LocationTypeEnum.Flat;
                    ben[9].LocationType = (int)LocationTypeEnum.Flat;
                    ben[9].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[10].LocationType = (int)LocationTypeEnum.Flat;
                    ben[11].LocationType = (int)LocationTypeEnum.Flat;
                    ben[11].EnableStatus = (int)EnableStatusEnum.Normal;
                    BaseDal.UpdateData(ben);
                    return content.OK("1");
                }
                //正常改成剔除
                else
                {
                    ben[0].LocationType = (int)LocationTypeEnum.Cube;
                    ben[1].LocationType = (int)LocationTypeEnum.Cube;
                    ben[1].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[2].LocationType = (int)LocationTypeEnum.Cube;
                    ben[3].LocationType = (int)LocationTypeEnum.Cube;
                    ben[3].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[4].LocationType = (int)LocationTypeEnum.Cube;
                    ben[5].LocationType = (int)LocationTypeEnum.Cube;
                    ben[5].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[6].LocationType = (int)LocationTypeEnum.Cube;
                    ben[7].LocationType = (int)LocationTypeEnum.Cube;
                    ben[7].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[8].LocationType = (int)LocationTypeEnum.Cube;
                    ben[9].LocationType = (int)LocationTypeEnum.Cube;
                    ben[9].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[10].LocationType = (int)LocationTypeEnum.Cube;
                    ben[11].LocationType = (int)LocationTypeEnum.Cube;
                    ben[11].EnableStatus = (int)EnableStatusEnum.Disable;
                    BaseDal.UpdateData(ben);
                    return content.OK("1");
                }
            }
            else if (k == 3)
            {
                List<Dt_LocationInfo> ben = BaseDal.QueryData(v => v.Id <= 2493 && v.Id >= 2482);
                //判断是否有货
                if (ben[0].LocationStatus == (int)LocationStatusEnum.InStock || ben[1].LocationStatus == (int)LocationStatusEnum.InStock || ben[2].LocationStatus == (int)LocationStatusEnum.InStock || ben[3].LocationStatus == (int)LocationStatusEnum.InStock || ben[4].LocationStatus == (int)LocationStatusEnum.InStock || ben[5].LocationStatus == (int)LocationStatusEnum.InStock || ben[6].LocationStatus == (int)LocationStatusEnum.InStock || ben[7].LocationStatus == (int)LocationStatusEnum.InStock || ben[8].LocationStatus == (int)LocationStatusEnum.InStock || ben[9].LocationStatus == (int)LocationStatusEnum.InStock || ben[10].LocationStatus == (int)LocationStatusEnum.InStock || ben[11].LocationStatus == (int)LocationStatusEnum.InStock)
                {
                    return content.OK("2");
                }
                //剔除改成正常
                if (ben[0].LocationType == (int)LocationTypeEnum.Cube)
                {
                    ben[0].LocationType = (int)LocationTypeEnum.Flat;
                    ben[1].LocationType = (int)LocationTypeEnum.Flat;
                    ben[1].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[2].LocationType = (int)LocationTypeEnum.Flat;
                    ben[3].LocationType = (int)LocationTypeEnum.Flat;
                    ben[3].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[4].LocationType = (int)LocationTypeEnum.Flat;
                    ben[5].LocationType = (int)LocationTypeEnum.Flat;
                    ben[5].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[6].LocationType = (int)LocationTypeEnum.Flat;
                    ben[7].LocationType = (int)LocationTypeEnum.Flat;
                    ben[7].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[8].LocationType = (int)LocationTypeEnum.Flat;
                    ben[9].LocationType = (int)LocationTypeEnum.Flat;
                    ben[9].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[10].LocationType = (int)LocationTypeEnum.Flat;
                    ben[11].LocationType = (int)LocationTypeEnum.Flat;
                    ben[11].EnableStatus = (int)EnableStatusEnum.Normal;
                    BaseDal.UpdateData(ben);
                    return content.OK("1");
                }
                //正常改成剔除
                else
                {
                    ben[0].LocationType = (int)LocationTypeEnum.Cube;
                    ben[1].LocationType = (int)LocationTypeEnum.Cube;
                    ben[1].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[2].LocationType = (int)LocationTypeEnum.Cube;
                    ben[3].LocationType = (int)LocationTypeEnum.Cube;
                    ben[3].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[4].LocationType = (int)LocationTypeEnum.Cube;
                    ben[5].LocationType = (int)LocationTypeEnum.Cube;
                    ben[5].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[6].LocationType = (int)LocationTypeEnum.Cube;
                    ben[7].LocationType = (int)LocationTypeEnum.Cube;
                    ben[7].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[8].LocationType = (int)LocationTypeEnum.Cube;
                    ben[9].LocationType = (int)LocationTypeEnum.Cube;
                    ben[9].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[10].LocationType = (int)LocationTypeEnum.Cube;
                    ben[11].LocationType = (int)LocationTypeEnum.Cube;
                    ben[11].EnableStatus = (int)EnableStatusEnum.Disable;
                    BaseDal.UpdateData(ben);
                    return content.OK("1");
                }
            }
            else if (k == 4)
            {
                List<Dt_LocationInfo> ben = BaseDal.QueryData(v => v.Id <= 2471 && v.Id >= 2460);
                //判断是否有货
                if (ben[0].LocationStatus == (int)LocationStatusEnum.InStock || ben[1].LocationStatus == (int)LocationStatusEnum.InStock || ben[2].LocationStatus == (int)LocationStatusEnum.InStock || ben[3].LocationStatus == (int)LocationStatusEnum.InStock || ben[4].LocationStatus == (int)LocationStatusEnum.InStock || ben[5].LocationStatus == (int)LocationStatusEnum.InStock || ben[6].LocationStatus == (int)LocationStatusEnum.InStock || ben[7].LocationStatus == (int)LocationStatusEnum.InStock || ben[8].LocationStatus == (int)LocationStatusEnum.InStock || ben[9].LocationStatus == (int)LocationStatusEnum.InStock || ben[10].LocationStatus == (int)LocationStatusEnum.InStock || ben[11].LocationStatus == (int)LocationStatusEnum.InStock)
                {
                    return content.OK("2");
                }
                //剔除改成正常
                if (ben[0].LocationType == (int)LocationTypeEnum.Cube)
                {
                    ben[0].LocationType = (int)LocationTypeEnum.Flat;
                    ben[1].LocationType = (int)LocationTypeEnum.Flat;
                    ben[1].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[2].LocationType = (int)LocationTypeEnum.Flat;
                    ben[3].LocationType = (int)LocationTypeEnum.Flat;
                    ben[3].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[4].LocationType = (int)LocationTypeEnum.Flat;
                    ben[5].LocationType = (int)LocationTypeEnum.Flat;
                    ben[5].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[6].LocationType = (int)LocationTypeEnum.Flat;
                    ben[7].LocationType = (int)LocationTypeEnum.Flat;
                    ben[7].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[8].LocationType = (int)LocationTypeEnum.Flat;
                    ben[9].LocationType = (int)LocationTypeEnum.Flat;
                    ben[9].EnableStatus = (int)EnableStatusEnum.Normal;
                    ben[10].LocationType = (int)LocationTypeEnum.Flat;
                    ben[11].LocationType = (int)LocationTypeEnum.Flat;
                    ben[11].EnableStatus = (int)EnableStatusEnum.Normal;
                    BaseDal.UpdateData(ben);
                    return content.OK("1");
                }
                //正常改成剔除
                else
                {
                    ben[0].LocationType = (int)LocationTypeEnum.Cube;
                    ben[1].LocationType = (int)LocationTypeEnum.Cube;
                    ben[1].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[2].LocationType = (int)LocationTypeEnum.Cube;
                    ben[3].LocationType = (int)LocationTypeEnum.Cube;
                    ben[3].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[4].LocationType = (int)LocationTypeEnum.Cube;
                    ben[5].LocationType = (int)LocationTypeEnum.Cube;
                    ben[5].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[6].LocationType = (int)LocationTypeEnum.Cube;
                    ben[7].LocationType = (int)LocationTypeEnum.Cube;
                    ben[7].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[8].LocationType = (int)LocationTypeEnum.Cube;
                    ben[9].LocationType = (int)LocationTypeEnum.Cube;
                    ben[9].EnableStatus = (int)EnableStatusEnum.Disable;
                    ben[10].LocationType = (int)LocationTypeEnum.Cube;
                    ben[11].LocationType = (int)LocationTypeEnum.Cube;
                    ben[11].EnableStatus = (int)EnableStatusEnum.Disable;
                    BaseDal.UpdateData(ben);
                    return content.OK("1");
                }
            }
            return content.OK("4");
        }
    }
    public class LocationConfig
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/StockInfoService.cs
@@ -1,4 +1,6 @@
using AutoMapper;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_IWMSPart;
@@ -19,6 +21,16 @@
        {
            _mapper = mapper;
        }
        public override WebResponseContent UpdateData(SaveModel saveModel)
        {
            int id = saveModel.MainData["id"].ObjToInt();
            int StockStatus = saveModel.MainData["stockStatus"].ObjToInt();
            int Remark = saveModel.MainData["remark"].ObjToInt();
            Dt_StockInfo locationInfo = BaseDal.QueryFirst(x => x.Id == id);
            locationInfo.StockStatus = StockStatus;
            locationInfo.Remark = Remark;
            return UpdateData(locationInfo);
            //return base.UpdateData(saveModel);
        }
    }
}