南骏 池
4 天以前 758275d35a4354bbabc0eabfcace5f74f318f33e
1.PDA拆分bug优化,转换为浮点型比较。
2.AGV操作组织页面优化
已修改5个文件
29 ■■■■ 文件已修改
H5/AgvCz.aspx 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/BarCf.aspx 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/BarCfBefore.aspx 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/BarCf.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/BarCfBefore.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/AgvCz.aspx
@@ -61,6 +61,11 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
        <van-notice-bar
    :scrollable="false"
    :text="'当前组织:' + (Cookies.get('orgName') || '暂无组织信息')"
    class="org-info"
/></van-notice-bar>
    <div class="content-wrapper">
        <van-nav-bar
            title="AGV操作"
H5/BarCf.aspx
@@ -8,6 +8,11 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
        <van-notice-bar
    :scrollable="false"
    :text="'当前组织:' + (Cookies.get('orgName') || '暂无组织信息')"
    class="org-info"
/></van-notice-bar>
    <van-nav-bar
  title="在库分料"
  left-text="返回"
@@ -73,5 +78,5 @@
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/BarCf.js?<%=121111 %>"></script>
    <script src="Js/BarCf.js?<%=1211111 %>"></script>
</asp:Content>
H5/BarCfBefore.aspx
@@ -8,6 +8,11 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
        <van-notice-bar
    :scrollable="false"
    :text="'当前组织:' + (Cookies.get('orgName') || '暂无组织信息')"
    class="org-info"
/></van-notice-bar>
    <van-nav-bar
  title="入库前拆料"
  left-text="返回"
H5/Js/BarCf.js
@@ -115,10 +115,16 @@
                that.$toast.fail("拆分数量不能为空!");
                return;
            }
            if (that.formData.cfNum > that.formData.sumQuantity) {
            //if (that.formData.cfNum > that.formData.sumQuantity) {
            //    that.$toast.fail("拆分数量不能大于条码数量!");
            //    return;
            //}
            if (parseFloat(that.formData.cfNum) > parseFloat(that.formData.sumQuantity)) {
                that.$toast.fail("拆分数量不能大于条码数量!");
                return;
            }
            if (that.formData.barcode.length * 1 <= 0) {
                that.$toast.fail("物料条码不能为空!");
                return;
H5/Js/BarCfBefore.js
@@ -115,12 +115,12 @@
                that.$toast.fail("拆分数量不能为空!");
                return;
            }
            // ... existing code ...
            if (parseFloat(that.formData.cfNum) > parseFloat(that.formData.sumQuantity)) {
                that.$toast.fail("拆分数量不能大于条码数量!");
                return;
            }
            // ... existing code ...
            if (that.formData.barcode.length * 1 <= 0) {
                that.$toast.fail("物料条码不能为空!");
                return;