Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalInventoryRecords.java

@@ -9,6 +9,7 @@ public class ApprovalInventoryRecords implements Serializable {
     private static final long serialVersionUID = -2060549066223267336L;
     private Integer storageId;//
     private Integer approvalId;//审批订单id
+    private Integer itemId;//审批订单产品项id
     private Integer storageState;//入库状态
     private Integer productId;//产品id
     private String productName;//产品名称
@@ -106,4 +107,12 @@ public class ApprovalInventoryRecords implements Serializable {
     public void setOperatingTime(Integer operatingTime) {
         this.operatingTime = operatingTime;
     }
+
+    public Integer getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Integer itemId) {
+        this.itemId = itemId;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/approval/ApprovalOrderService.java

@@ -91,4 +91,9 @@ public interface ApprovalOrderService {
      * @return
      */
     Integer insertInventoryRecords(ApprovalInventoryRecords approvalInventoryRecords);
+    /**
+     * 查询单个审批订单项
+     * @return
+     */
+    ApprovalProductionItem getProductionItem(Integer itemId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -204,4 +204,9 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
     public Integer insertInventoryRecords(ApprovalInventoryRecords approvalInventoryRecords) {
         return approvalOrderMapper.insertInventoryRecords(approvalInventoryRecords);
     }
+
+    @Override
+    public ApprovalProductionItem getProductionItem(Integer itemId) {
+        return approvalOrderMapper.getProductionItem(itemId);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/ApprovalOrderMapper.java

@@ -80,6 +80,11 @@ public interface ApprovalOrderMapper {
       * @return
       */
      Integer insertInventoryRecords(ApprovalInventoryRecords approvalInventoryRecords);
+     /**
+      * 查询单个审批订单项
+      * @return
+      */
+     ApprovalProductionItem getProductionItem(Integer itemId);
 
 
 

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -333,7 +333,7 @@
   </select>
 
 
-  <!--查询提货产品项信息-->
+  <!--查询审批产品项信息-->
   <select id="listProductionItem" parameterType="Integer" resultType="ApprovalProductionItem">
     SELECT
     api.item_id itemId,
@@ -483,23 +483,18 @@
       <if test="itemShouldStorage != null" >
         item_should_storage = #{itemShouldStorage},
       </if>
-      <if test="itemActualStorage != null" >
-        item_actual_storage = #{itemActualStorage},
-      </if>
       <if test="itemLackNumber != null" >
         item_lack_number = #{itemLackNumber}
       </if>
     </set>
-    <where>
-      <if test="itemId != null and itemId != ''">
-        item_id = #{itemId}
-      </if>
-    </where>
+    WHERE
+    item_id = #{itemId}
   </update>
   <!-- 添加仓库入库记录-->
   <insert id="insertInventoryRecords" parameterType="ApprovalInventoryRecords">
     INSERT INTO tb_rst_approval_inventory_records(
     approval_id,
+    item_id,
     storage_state,
     product_id,
     product_name,
@@ -511,8 +506,31 @@
     operating_time
     )
     VALUES
-    (#{approvalId},#{storageState},#{productId}
+    (#{approvalId},#{itemId},#{storageState},#{productId}
     ,#{productName},#{colorName},#{shouldStorage}
     ,#{actualStorage},#{lackNumber},#{operatingAdminId},NOW())
   </insert>
+
+  <!--查询单个审批产品项信息-->
+  <select id="getProductionItem" parameterType="Integer" resultType="ApprovalProductionItem">
+    SELECT
+    api.item_id itemId,
+    api.production_id productionId,
+    api.product_id productId,
+    api.item_product_name itemProductName,
+    api.item_color_name itemColorName,
+    api.item_product_num itemProductNum,
+    api.item_brand_name itemBrandName,
+    api.item_product_model itemProductModel,
+    api.item_product_unit itemProductUnit,
+    api.item_product_box_number itemProductBoxNumber,
+    api.item_should_storage itemShouldStorage,
+    api.item_actual_storage itemActualStorage,
+    api.item_lack_number itemLackNumber,
+    api.item_create_time itemCreateTime,
+    api.item_update_time itemUpdateTime
+    from tb_rst_approval_production_item api
+    where
+    api.item_id = #{itemId}
+  </select>
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -95,6 +95,9 @@
                 <if test="salesPostFirm !=null and salesPostFirm !=''">
                     AND sales_post_firm = #{salesPostFirm}
                 </if>
+                <if test="salesPostNum !=null and salesPostNum !=''">
+                    AND sales_post_num like CONCAT('%',#{salesPostNum},'%')
+                </if>
                 <if test="salesCompanyId !=null and salesCompanyId !=''">
                     AND sales_company_id = #{salesCompanyId}
                 </if>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -335,4 +335,61 @@ public class ApprovalController {
         return rj;
     }
 
+    /**
+     * 添加入库信息
+     * @param request
+     * @param inventoryRecordss
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/addInventoryRecords")
+    public ResponseJson addInventoryRecords(HttpServletRequest request, String inventoryRecordss){
+        ResponseJson rj =new ResponseJson(200, "添加成功", 200);
+        if (inventoryRecordss == null || inventoryRecordss.equals("")) {
+            return  ResponseJson.getFAILURE();
+        }
+        //获取openid,根据openid查询当前登录人信息
+        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
+        Admin admin = sysService.getByOpenid(openId);
+        if(admin == null){
+            return new ResponseJson(200, "未查询到登录人信息", 500);
+        }
+        JSONArray jsonRecordss = JSONArray.fromObject(inventoryRecordss);
+        for (int i = 0; i < jsonRecordss.size(); i++) {
+            JSONObject jsonRecords = jsonRecordss.getJSONObject(i);
+            //封装入库信息
+            ApprovalInventoryRecords records = new ApprovalInventoryRecords();
+            if(jsonRecords.get("shouldStorage") == null || jsonRecords.get("actualStorage") == null){
+                if(jsonRecords.getInt("shouldStorage") < jsonRecords.getInt("actualStorage")){
+                    return new ResponseJson(200, "实际入库数量不得大于应入库数量", 500);
+                }
+            }
+            records.setStorageState(jsonRecords.getInt("shouldStorage") > jsonRecords.getInt("actualStorage") ? 1 : 2);
+            records.setApprovalId(jsonRecords.getInt("approvalId"));
+            records.setProductName(jsonRecords.getString("productName"));
+            records.setColorName(jsonRecords.getString("colorName"));
+            records.setActualStorage(jsonRecords.getInt("actualStorage"));
+            records.setShouldStorage(jsonRecords.getInt("shouldStorage"));
+            records.setLackNumber(jsonRecords.getInt("lackNumber"));
+            records.setOperatingAdminId(admin.getAdminId());
+            if(approvalOrderService.insertInventoryRecords(records) < 1){
+                return new ResponseJson(200, "添加入库记录失败", 500);
+            }
+            //修改订单项信息
+            if(jsonRecords.get("itemId") == null || jsonRecords.get("itemId").equals("")){
+                return new ResponseJson(200, "产品项id不能为空", 500);
+            }
+
+            ApprovalProductionItem productionItem = approvalOrderService.getProductionItem(jsonRecords.getInt("itemId"));
+            if(productionItem.getItemActualStorage() < productionItem.getItemShouldStorage() + jsonRecords.getInt("shouldStorage")){
+                return new ResponseJson(200, "产品项id不能为空", 500);
+            }
+            productionItem.setItemShouldStorage(productionItem.getItemShouldStorage() + jsonRecords.getInt("shouldStorage"));
+            productionItem.setItemLackNumber(productionItem.getItemActualStorage() - (productionItem.getItemShouldStorage() + jsonRecords.getInt("shouldStorage")));
+            if(approvalOrderService.updateProductionItem(productionItem) < 1){
+                return new ResponseJson(200, "修改审批产品项失败", 500);
+            }
+        }
+        return rj;
+    }
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -969,6 +969,24 @@ public class AdminSalesOrderController {
     }
 
     /**
+     * 作废订单
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/invalidationOrder")
+    @RequiresPermissions("salesOrder:confirm:salesOrder")
+    public ResponseJson invalidationOrder(HttpServletRequest request,
+                                          @RequestParam("salesId") Integer salesId) throws Exception {
+        SalesOrder so = new SalesOrder();
+        so.setSalesId(salesId);
+        so.setSalesStatus(3);
+        Integer res = salesOrderService.updateOrderInfo(so);
+        return res <= 0 ? ResponseJson.getFAILURE() : ResponseJson.getSUCCESS();
+    }
+
+    /**
      * 分配快递方式
      * @param request
      * @return

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -13,11 +13,8 @@ import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.utils.OrderUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.AddrUtil;
-import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.UUIDGenerator;
-import com.iamberry.wechat.tools.payUtil.StringUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,7 +68,8 @@ public class AwaitSendController {
                                            @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
                                            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                            @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
-        // 分页获取订单信息
+        // 分页获取订单信息（仓库只能查询已确认的订单）
+        salesOrder.setSalesStatus(1);
         PagedResult<SalesOrder> pagedResult = salesOrderService.listAwaitSendSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
@@ -133,6 +131,8 @@ public class AwaitSendController {
         } else {
             salesOrder.setSalesIds(orders);
         }
+        // 查询确认的订单
+        salesOrder.setSalesStatus(1);
         PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(1, 1000, salesOrder, false);
         // 查询订单项
         if (pagedResult != null && pagedResult.getDataList() != null && !pagedResult.getDataList().isEmpty()) {

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

@@ -454,12 +454,12 @@
 
         $("#search-product-name-btn").click(function() {
            var name = $("#search-product-name-input").val();
-           var trs = $("#addProduct").find("tr");
+           var trs = $("#addProduct").children("tr");
            if (trs == null || trs.length <= 0) {
                return;
            }
            for (var i = 0; i < trs.length;i ++) {
-               var temp = $($(trs[i]).find("td")[0]).find("span").text();
+               var temp = $($(trs[i]).children("td")[0]).find("span").text();
                if (temp.indexOf(name) == -1) {
                    $(trs[i]).hide();
                } else {

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -79,7 +79,7 @@
             </div>
             <div class="row cl" id="salesCustomer" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
-                <div class="formControls col-2 col-sm-2" style="color: #c00;">
+                <div class="formControls col-2 col-sm-2" style="margin-left: 15%;width: 100%;color: #c00;">
                     <span id="salesCustomerIdHtml"></span>
                     <input type="hidden" id="salesCustomerId" name="salesCustomerId" value="">
                 </div>

watero-rst-web/src/main/webapp/common/js/salesOrder/salesOrder.js

@@ -115,9 +115,14 @@ function setSelectCustomer(customerId){
                 var customer = data.returnMsg.customer;
                 $("#salesCustomerIdHtml").html("已经选择客诉记录："+customer.customerId);
                 $("#salesCustomerId").val(customer.customerId);
-
                 sc.setCompanyId(customer.companyId);
                 sc.setStoreId(customer.storeId);
+                /*设置用户姓名、电话*/
+                $("#salesAddressName").val(customer.customerName);
+                $("#salesAddressTel").val(customer.customerTel);
+                /* 售后订单的支付时间、支付方式默认 */
+                $("#salesPayTime").val(customer.salesTime);
+
             }else{
             }
             $("#salesCustomer").show();