修改rst bug

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsComponents.java

@@ -43,6 +43,8 @@ public class PtsComponents implements Serializable {
 
     private String supplierName;//供应商名
 
+    private String produceName; //产品名称
+
     public Integer getComponentsId() {
         return componentsId;
     }
@@ -178,4 +180,12 @@ public class PtsComponents implements Serializable {
     public void setSupplierName(String supplierName) {
         this.supplierName = supplierName;
     }
+
+    public String getProduceName() {
+        return produceName;
+    }
+
+    public void setProduceName(String produceName) {
+        this.produceName = produceName;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/PtsSalesCompanyService.java

@@ -16,4 +16,11 @@ public interface PtsSalesCompanyService {
      */
     List<PtsSalesCompany> listPtsSalesCompany(PtsSalesCompany ptsSalesCompany);
 
+    /**
+     * 获取销售公司
+     * @param ptsSalesCompany
+     * @return
+     */
+    PtsSalesCompany getPtsSalesCompany(PtsSalesCompany ptsSalesCompany);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/PtsSalesCompanyServiceImpl.java

@@ -19,4 +19,9 @@ public class PtsSalesCompanyServiceImpl implements PtsSalesCompanyService {
     public List<PtsSalesCompany> listPtsSalesCompany(PtsSalesCompany ptsSalesCompany) {
         return ptsSalesCompanyMapper.listPtsSalesCompany(ptsSalesCompany);
     }
+
+    @Override
+    public PtsSalesCompany getPtsSalesCompany(PtsSalesCompany ptsSalesCompany) {
+        return ptsSalesCompanyMapper.getPtsSalesCompany(ptsSalesCompany);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/PtsSalesCompanyMapper.java

@@ -16,4 +16,11 @@ public interface PtsSalesCompanyMapper {
      */
     List<PtsSalesCompany> listPtsSalesCompany(PtsSalesCompany ptsSalesCompany);
 
+    /**
+     * 获取销售公司
+     * @param ptsSalesCompany
+     * @return
+     */
+    PtsSalesCompany getPtsSalesCompany(PtsSalesCompany ptsSalesCompany);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/equipmentMapper.xml

@@ -16,7 +16,7 @@
         FROM
         tb_rst_pts_device
         <where>
-            <if test="deviceNumber != null">
+            <if test="deviceNumber != null and deviceNumber !=''">
                 device_number like CONCAT('%',#{deviceNumber},'%')
             </if>
             <if test="deviceName != null">
@@ -31,9 +31,6 @@
             <if test="deviceId != null">
                 and device_id = #{deviceId}
             </if>
-            <if test="deviceNumber != null and deviceNumber !='' ">
-                and device_number = #{deviceNumber}
-            </if>
         </where>
         ORDER BY device_id DESC
     </select>

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -164,7 +164,8 @@
          machine_batch_id machineBatchId,
          machine_bom_id  machineBomId,
          machine_is_retreading  machineIsRetreading,
-         machine_line  machineLine
+         machine_line  machineLine,
+         machine_sales_company_id machineSalesCompanyId
         from tb_rst_pts_machine WHERE  machine_id = #{machineId}
         order by machine_create_time desc
     </select>

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machinePartsMapper.xml

@@ -69,9 +69,11 @@
             t.components_desc AS componentsDesc,
             t.components_create_time AS componentsCreateTime,
             t.components_update_time AS componentsUpdateTime,
-            s.supplier_name AS supplierName
+            s.supplier_name AS supplierName,
+            trpp.produce_name AS  produceName
         FROM
             tb_rst_pts_components t LEFT JOIN tb_rst_pts_supplier s on t.supplier_id = s.supplier_id
+            LEFT JOIN tb_rst_pts_produce trpp ON t.produce_id = trpp.produce_id
         <where>
             <if test="componentsType !=null and componentsType !='' ">
                 AND t.components_type = #{componentsType}
@@ -95,6 +97,7 @@
                 AND t.supplier_id = #{supplierId}
             </if>
         </where>
+        ORDER BY t.components_id DESC
     </select>
 
     <update id="updateParts" parameterType="PtsComponents" >

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml

@@ -96,7 +96,7 @@
                 employee_id = #{employeeId}
             </if>
             <if test="employeeNo !=null and employeeNo !=''">
-               AND employee_no = like CONCAT('%',#{employeeNo},'%')
+               AND employee_no like CONCAT('%',#{employeeNo},'%')
             </if>
             <if test="employeeName !=null and employeeName !=''">
                 AND employee_name like CONCAT('%',#{employeeName},'%')
@@ -136,9 +136,6 @@
             <if test="employeeEntryDate !=null and employeeEntryDate !=''">
                 employee_entry_date = #{employeeEntryDate},
             </if>
-            <if test="employeeDepartureDate !=null and employeeDepartureDate !=''">
-                employee_departure_date = #{employeeDepartureDate},
-            </if>
             <if test="employeePost !=null and employeePost !=''">
                 employee_post = #{employeePost},
             </if>
@@ -148,6 +145,7 @@
             <if test="employeeLine !=null and employeeLine !=''">
                 employee_line = #{employeeLine},
             </if>
+            employee_departure_date = #{employeeDepartureDate},
             employee_desc = #{employeeDesc}
         </set>
         where

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsSalesCompanyMapper.xml

@@ -4,13 +4,32 @@
 
     <select id="listPtsSalesCompany" parameterType="PtsSalesCompany" resultType="PtsSalesCompany">
         SELECT
-            t.sales_company_id,
-            t.sales_company_name,
-            t.sales_company_abbreviation,
-            t.sales_company_address,
-            t.sales_company_create_time,
-            t.sales_company_update_time
+            t.sales_company_id salesCompanyId,
+            t.sales_company_name salesCompanyName,
+            t.sales_company_abbreviation salesCompanyAbbreviation,
+            t.sales_company_address salesCompanyAddress,
+            t.sales_company_create_time salesCompanyCreateTime,
+            t.sales_company_update_time salesCompanyUpdateTime
         FROM
             tb_rst_pts_sales_company t
     </select>
+
+    <select id="getPtsSalesCompany" parameterType="PtsSalesCompany" resultType="PtsSalesCompany">
+        SELECT
+            t.sales_company_id salesCompanyId,
+            t.sales_company_name salesCompanyName,
+            t.sales_company_abbreviation salesCompanyAbbreviation,
+            t.sales_company_address salesCompanyAddress,
+            t.sales_company_create_time salesCompanyCreateTime,
+            t.sales_company_update_time salesCompanyUpdateTime
+        FROM
+            tb_rst_pts_sales_company t
+        <where>
+            <if test="salesCompanyId !=null and salesCompanyId !=''">
+                t.sales_company_id = #{salesCompanyId}
+            </if>
+        </where>
+    </select>
+
+
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -259,6 +259,14 @@ public class AdminMachineController {
             produce = produceService.getProduce(produce);
         }
 
+        //获取销售公司
+        PtsSalesCompany ptsSalesCompany = new PtsSalesCompany();
+        if(ptsMachine != null && ptsMachine.getMachineSalesState() == 1 && ptsMachine.getMachineSalesCompanyId() != null){
+            ptsSalesCompany.setSalesCompanyId(ptsMachine.getMachineSalesCompanyId());
+            ptsSalesCompany = ptsSalesCompanyService.getPtsSalesCompany(ptsSalesCompany);
+        }
+
+        mv.addObject("ptsSalesCompany", ptsSalesCompany);
         mv.addObject("produce", produce);
         mv.addObject("ptsMachineVersion", ptsMachineVersion);
         mv.addObject("ptsBatch", ptsBatch);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminPtsBatchController.java

@@ -43,7 +43,7 @@ public class AdminPtsBatchController {
     @Autowired
     private MachineVersionService machineVersionService;
 
-    private String[] BATCH_COLOR = {"黑色","白色","红色","蓝色","绿色","橙色","黄色","青色","紫色"};
+    private String[] BATCH_COLOR = {"黑色","白色","金色","红色","蓝色","绿色","橙色","黄色","青色","紫色"};
 
     /**
      * 获取batch列表
@@ -84,6 +84,7 @@ public class AdminPtsBatchController {
         //获取产品集合，用于页面选择产品
         List<Produce> produceList = produceService.getProduceList();
 
+        mv.addObject("bacthColor", BATCH_COLOR);
         mv.addObject("produceList", produceList);
         return mv;
     }

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/add_batch.ftl

@@ -142,7 +142,8 @@
 </article>
 <script type="text/javascript">
     /*颜色枚举值*/
-    var colorAll = ['黑色','白色','红色','蓝色','绿色','橙色','黄色','青色','紫色'];
+    var colorAll = ['黑色','白色',"金色",'红色','蓝色','绿色','橙色','黄色','青色','紫色'];
+
 
     /*修改批次时，获取之前的批次编号，添加页面为空*/
     var upBatchNo = null;

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/update_batch.ftl

@@ -172,7 +172,7 @@
 </article>
 <script type="text/javascript">
     /*颜色枚举值*/
-    var colorAll = ['黑色','白色','红色','蓝色','绿色','橙色','黄色','青色','紫色'];
+    var colorAll = ['黑色','白色',"金色",'红色','蓝色','绿色','橙色','黄色','青色','紫色'];
 
     /*修改批次时，获取之前的批次编号，添加页面为空*/
     var upBatchNo = '${ptsBatch.batchNo}';

watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/bom_list.ftl

@@ -40,7 +40,7 @@
                     </#list>
                 </#if>
             </select>
-            <input type="text" class="my-input"  style="width:150px" value="${bomId!}" placeholder="Bom单编号" id="bomId" name="bomId">
+           <#-- <input type="text" class="my-input"  style="width:150px" value="${bomId!}" placeholder="Bom单编号" id="bomId" name="bomId">-->
             <input type="text" class="my-input"  style="width:150px" value="${bomName!}" placeholder="Bom单名称" id="bomName" name="bomName">
             <input type="text" class="my-input"  style="width:150px" value="${bomRemarks!}" placeholder="Bom单备注" id="bomRemarks" name="bomRemarks">
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
@@ -89,7 +89,7 @@
                         </tr>
                     </#list>
             <#else>
-                <tr><td colspan="9" class="td-manage text-c" >暂时没有Bom，请添加！</td></tr>
+                <tr><td colspan="10" class="td-manage text-c" >暂时没有Bom，请添加！</td></tr>
             </#if>
         </tbody>
     </table>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_particulars.ftl

@@ -275,6 +275,21 @@
                 </article>
             </div>
         </li>
+
+    </ul>
+
+    <div class="my-title">机器销售信息</div>
+    <ul class="my-list">
+        <li>销售状态：
+            <#if ptsMachine.machineSalesState == 1><span class="text-blue">已售出</#if>
+            <#if ptsMachine.machineSalesState == 2><span class="text-blue">未售出</#if>
+        </li>
+        <#if ptsMachine.machineSalesState == 1>
+            <li style="width: 100%;height: 25px;">
+                <div style="float: left;width: 200px;">销售时间：${(ptsMachine.machineSalesDate?string("yyyy-MM-dd"))!''}</div>
+                <div style="float: left;width: 200px;">销售公司：${ptsSalesCompany.salesCompanyName ! ''}</div>
+            </li>
+        </#if>
     </ul>
 </div>
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/parts_list.ftl

@@ -62,18 +62,19 @@
         <table class="table table-border table-bordered table-bg table-hover table-sort">
         <thead>
         <tr class="text-c">
-            <th width="50">零件编号</th>
-            <th width="60">供应商</th>
+            <th width="70">所属产品</th>
+            <th width="70">零件编号</th>
+            <th width="70">供应商</th>
             <th width="100">零件名称</th>
             <th width="80">图片</th>
-            <th width="80">状态</th>
-            <th width="100">成本（元）</th>
-            <th width="80">重量（g）</th>
+            <th width="50">状态</th>
+            <th width="50">成本（元）</th>
+            <th width="50">重量（g）</th>
             <th width="80">材料</th>
             <th width="80">材料类型</th>
-            <th width="80">MBSC</th>
+            <th width="40">MBSC</th>
             <th width="80">规格</th>
-            <th width="80">备注</th>
+            <#--<th width="80">备注</th>-->
             <th width="80">操作</th>
         </tr>
         </thead>
@@ -81,6 +82,7 @@
             <#if page.dataList?? &&  (page.dataList?size > 0) >
                     <#list page.dataList as parts>
                         <tr class="text-c">
+                            <td>${parts.produceName!''}</td>
                             <td>${parts.componentsNo!''}</td>
                             <td>${parts.supplierName!''}</td>
                             <td>${parts.componentsName!''}</td>
@@ -95,7 +97,7 @@
                                 <#if parts.componentsType == 3>其他</#if></td>
                             <td>${parts.componentsMbsc!''}</td>
                             <td>${parts.componentsSpecification!''}</td>
-                            <td>${parts.componentsDesc!''}</td>
+                            <#--<td>${parts.componentsDesc!''}</td>-->
                             <td>
                                 <a style="text-decoration:none" href="javascript:void(0);" title="编辑" onclick="admin_update_parts(${parts.componentsId!''});">
                                     <i class="Hui-iconfont">&#xe6df;</i>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/ptras_add.ftl

@@ -109,13 +109,13 @@
 		</div>
 
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件成本：</label>
+            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件成本(元)：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <input type="text" class="input-text" value=""  id="componentsCost" name="componentsCost" placeholder="请输入零件成本，单位为元"  oninput= 'this.value = this.value.replace(/\D+/g, "")' onblur = 'this.value = this.value.replace(/\D+/g, "")'>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件重量：</label>
+            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件重量(g)：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <input type="text" class="input-text" value="" id="componentsWeight" name="componentsWeight" placeholder="请输入零件重量，单位为克"  onkeyup="value=value.replace(/[^\d.]/g,'')" >
             </div>
@@ -123,7 +123,7 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件材料：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value="" id="componentsMaterial" name="componentsMaterial" placeholder="请输入1-30位的材料，支持中文、字母、数字">
+                <input type="text" class="input-text" value="" id="componentsMaterial" name="componentsMaterial" placeholder="请输入零件材料，支持1-30位字符">
             </div>
         </div>
         <div class="row cl">
@@ -239,7 +239,6 @@
                 maxlength:1
             },
             componentsSpecification:{
-                required:true,
                 minlength:1,
                 maxlength:50
             },

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/ptras_update.ftl

@@ -99,13 +99,13 @@
 		</div>
 
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件成本：</label>
+            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件成本(元)：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <input type="text" class="input-text" value="${ptsComponents.componentsCost/100!''}"  id="componentsCost" name="componentsCost" placeholder="请输入零件成本，单位为元" oninput= 'this.value = this.value.replace(/\D+/g, "")' onblur = 'this.value = this.value.replace(/\D+/g, "")'>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件重量：</label>
+            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件重量(g)：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <input type="text" class="input-text" value="${ptsComponents.componentsWeight!''}"  id="componentsWeight" name="componentsWeight" placeholder="请输入零件重量，单位为克"  onkeyup="value=value.replace(/[^\d.]/g,'')">
             </div>
@@ -113,7 +113,7 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>零件材料：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value="${ptsComponents.componentsMaterial!''}" id="componentsMaterial" name="componentsMaterial" placeholder="请输入1-30位的材料，支持中文、字母、数字">
+                <input type="text" class="input-text" value="${ptsComponents.componentsMaterial!''}" id="componentsMaterial" name="componentsMaterial" placeholder="请输入零件材料，支持1-30位字符">
             </div>
         </div>
         <div class="row cl">
@@ -231,7 +231,6 @@
                 maxlength:1
             },
             componentsSpecification:{
-                required:true,
                 minlength:1,
                 maxlength:50
             },

watero-rst-web/src/main/webapp/WEB-INF/views/wap/pts/machine_delivery.ftl

@@ -260,111 +260,6 @@
             }
         });
     }
-
-    function change_input1() {
-        if($("#mydate")!=''){
-        }else{
-            alert_msg = "请选择租赁开始日期";
-            validate_flag = false;
-        }
-    };
-
-    mui('body').on('tap', '#btn_submit', function() {
-        change_input2();
-        var th=this;
-        if(validate_flag){
-            if(check) {
-                check = false; // 锁定请求按钮
-                var arr=new Array();
-                $("input[name^='checkbox1']:checked").each(function(){
-                    var clss = 'radio_p_' + $(this).val();
-                    arr.push($("input:radio[name='" + clss + "']:checked").val());
-                });
-                var orderUserRemark = '';
-                if ($('input[name="orderPayMoneyType"]:checked').val() == 2) {
-                    orderUserRemark = $("#payTypeAdress").attr("name")+"-"+$("#ipt_pay_type_adress").val();
-                }
-                var param = {
-                    "orderSourceId":$("#myAdress").attr("name"),
-                    "orderRentType": $("input[name=radio1]:checked").val(),
-                    "orderOpenId": $("#ipt_id_card").val(),
-                    "orderSendType":$("input[name=radio5]:checked").val(),
-                    "orderPayType":$("input[name=radio3]:checked").val(),
-                    "orderPayMoneyType":$("input[name=orderPayMoneyType]:checked").val(),
-                    "orderAddressTel":$("#ipt_tel").val(),
-                    "orderAddressName":$("#ipt_name").val(),
-                    "orderAddressInfo":$("#promAdress").attr("name")+"-"+$("#ipt_street_adress").val(),
-                    "startTime":$("#mydate").val(),
-                    "orderAdminRemark":$("#textarea").val(),
-                    "orderUserRemark":orderUserRemark,
-                    "itemColorId":$("input[name=radio2]:checked").val(),
-                    "orderProtocol":$("#ipt_number").val(),
-                    "itemProductId":$("input[name=radio4]:checked").val(),
-                    "orderPayNumber":$("#ipt_transaction").val(),
-                    "orderPayTime":$("#ipt_pay_time").val(),
-                    "giftIds":arr
-                };
-                $.ajax({
-                    type: 'post',
-                    url: '${path}/admin/order/add_order?dates=' + new Date().getTime(),
-                    data: param,
-                    dataType: 'json',
-                    timeout: 15000,
-                    success: function(dt) {
-                        if(dt.isRedirect) {
-                            location.href = dt.redirectURL;
-                        }else{
-                            if(dt.resultCode=='200' && dt.returnCode=='200') {
-                                check = false;
-                                var orderId=dt.returnMsg.orderId;
-                                mui.alert("提交成功!",function () {
-                                    mui.openWindow({
-                                        //跳转订单详情
-                                        url: '${path}/admin/order/_select_orderDetails?orderId='+orderId+'&status=1'
-                                    });
-                                });
-                            }else if(dt.returnCode == 502){
-                                check = true;
-                                mui.alert('协议编号已存在');
-                            } else {
-                                check = true;
-                                mui.alert(dt.returnMsg);
-                            }
-                        }
-                    },
-                    error: function(xhr, type, errorThrown) {
-                        //异常处理；
-                        check = true;
-                        mui.alert("提交失败！请检查网络或稍后重试！");
-                    }
-                });
-            }else{
-                mui.alert("正在提交中~~请稍后!");
-                return;
-            }
-        }else{
-            mui.alert(alert_msg);
-        }
-    });
-    function accDiv(arg1, arg2) {
-        var t1 = 0,
-                t2 = 0,
-                r1, r2;
-        try {
-            t1 = arg1.toString().split(".")[1].length
-        } catch(e) {}
-        try {
-            t2 = arg2.toString().split(".")[1].length
-        } catch(e) {}
-        with(Math) {
-            r1 = Number(arg1.toString().replace(".", ""));
-            r2 = Number(arg2.toString().replace(".", ""));
-            return(r1 / r2) * pow(10, t2 - t1)
-        }
-    };
-    Number.prototype.div = function(arg) {
-        return accDiv(this, arg)
-    };
 </script>
 </body>
 </html>