Merge branches 'develop' and 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/SignclosedProductInfo.java

@@ -24,6 +24,7 @@ public class SignclosedProductInfo implements Serializable {
     private Integer signclosedState;//签收状态 1待签收 2已签收
     private String colorName;//颜色名称
     private String productNumber;//产品型号
+    private String colorBar;//产品sku
     private Integer colorPrice;//产品价格
 
     public Integer getProductId() {
@@ -137,4 +138,12 @@ public class SignclosedProductInfo implements Serializable {
     public void setColorPrice(Integer colorPrice) {
         this.colorPrice = colorPrice;
     }
+
+    public String getColorBar() {
+        return colorBar;
+    }
+
+    public void setColorBar(String colorBar) {
+        this.colorBar = colorBar;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

@@ -28,6 +28,7 @@ import java.text.MessageFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoService {
@@ -533,6 +534,15 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
 
     @Override
     public Integer updatePrint(ComplaintDetectInfo detectInfo) {
+        ComplaintDetectInfo cdi = complaintDetectInfoMapper.getDetectByIdFast(detectInfo.getDetectId());
+        if(!Objects.equals(cdi.getDetectState(), detectInfo.getDetectState())){ //修改状态时判断状态，来调整库存
+            switch (detectInfo.getDetectState()){    //detectState
+                case 23:
+                    break;
+                default:
+                    break;
+            }
+        }
         return complaintDetectInfoMapper.updateDetectById(detectInfo);
     }
 

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -13,10 +13,7 @@ import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.fm.ComplaintSignclosedInfoService;
 import com.iamberry.rst.faces.sms.SmsService;
 import com.iamberry.rst.service.cm.mapper.*;
-import com.iamberry.rst.service.fm.mapper.AwaitingSignclosedProductMapper;
-import com.iamberry.rst.service.fm.mapper.ComplaintDetectInfoMapper;
-import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedInfoMapper;
-import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedProductInfoMapper;
+import com.iamberry.rst.service.fm.mapper.*;
 import com.iamberry.rst.service.product.mapper.ProductMapper;
 import com.iamberry.rst.util.PageUtil;
 import com.iamberry.rst.util.ProduceNoUtil;
@@ -50,6 +47,10 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
     @Autowired
     private CustomerInfoMapper customerInfoMapper;
     @Autowired
+    private InventoryMapper inventoryMapper;
+    @Autowired
+    private InventoryLogMapper inventoryLogMapper;
+    @Autowired
     private SmsService smsService;
 
     @Override
@@ -58,6 +59,8 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                           String orderItemString,String[] componentsImgs) {
         Integer msg = 0;
         int num = 0;
+        Integer signclosedId = null;
+        Integer flag = 0;
         //查询是否已存在相同单号
         if(record.getSignclosedLogisticsNumber() != null){
             ComplaintSignclosedInfo info = new ComplaintSignclosedInfo();
@@ -78,6 +81,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
             if(sinfoList.size() <= 0){
                 num = complaintSignclosedInfoMapper.insert(record);
                 msg = 1;//添加成功
+                signclosedId = record.getSignclosedId();
             }else{
                 //将签收记录改为已签收
                 ComplaintSignclosedInfo complaintSignclosedInfo = sinfoList.get(0);
@@ -86,6 +90,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                     complaintSignclosedInfo.setSignclosedDate(new Date());
                     complaintSignclosedInfoMapper.updateSignclosedById(complaintSignclosedInfo);
                     msg = 3;//已存在相同单号的签收信息并修改状态为已签收
+                    signclosedId = complaintSignclosedInfo.getSignclosedId();
                 }else{
                     msg = 4;//已存在相同单号的已签收信息
                 }
@@ -104,7 +109,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                         SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
                         //根据颜色id获取产品信息获取产品信息
                             ProductColor productColor = productMapper.getProduceColor(salesOrderItem.getItemColorId());
-                            Product product = productMapper.getProduce(productColor.getColorProductId());
+//                            Product product = productMapper.getProduce(productColor.getColorProductId());
                             if(productColor == null){
                                 msg = 2;
                             }
@@ -146,6 +151,35 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                     }
                 }
             }
+
+            if(msg == 1 || msg == 3){
+                SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                List<SignclosedProductInfo> signclosedProductInfoList = complaintSignclosedProductInfoMapper.listSignclosedById(signclosedId);
+                for (SignclosedProductInfo spi:signclosedProductInfoList) {
+                    InventoryInfo info = inventoryMapper.getByInventoryByBar(spi.getColorBar(),2);
+                    info.setInventoryDefectiveProductNum(info.getInventoryDefectiveProductNum()+spi.getProductNum());
+                    info.setInventoryRecentRecord(sdf.format(new Date())+"不良品入库："+ spi.getProductNum() + "件");
+                    flag =  inventoryMapper.updateById(info);
+                    if(flag < 1){
+                        throw new RuntimeException("更新库存失败，更新库存失败。");
+                    }
+
+                    //添加日志
+                    InventoryLog inventoryLog = new InventoryLog();
+                    inventoryLog.setLogProductName(info.getInventoryProductName());
+                    inventoryLog.setLogProductBar(info.getInventoryProductBar());
+                    inventoryLog.setLogRemainingNum(spi.getProductNum());
+                    inventoryLog.setLogType(3);
+                    inventoryLog.setLogOperationType(2);
+                    inventoryLog.setLogDesc(sdf.format(new Date())+"不良品入库："+spi.getProductNum()+"件");
+                    inventoryLog.setLogQualityType(2);
+                    inventoryLog.setLogWarehouseId(2);
+                    flag = inventoryLogMapper.insert(inventoryLog);
+                    if(flag < 1){
+                        throw new RuntimeException("更新库存失败，增加库存记录失败。");
+                    }
+                }
+            }
             //添加签收图片
             if(componentsImgs != null) {
                 if (componentsImgs.length > 0) {

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/ComplaintDetectInfoMapper.java

@@ -14,6 +14,12 @@ public interface ComplaintDetectInfoMapper {
      * @return
      */
     ComplaintDetectInfo getDetectById(Integer detectId);
+
+    /**
+     * 查询单个品质检测产品 - Small
+     * @return
+     */
+    ComplaintDetectInfo getDetectByIdFast(Integer detectId);
     /**
      * 修改单个待品质检测
      * @return

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -56,7 +56,10 @@
       cd.detect_completion_time detectCompletionTime,
       cd.maintenance_completion_time maintenanceCompletionTime,
       cd.renovation_completion_time renovationCompletionTime,
-      cd.scrap_completion_time scrapCompletionTime
+      cd.scrap_completion_time scrapCompletionTime,
+      qd.describe_content describeContent,
+      qd.describe_handle_desc describeHandleDesc,
+      sa.admin_name adminName
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
@@ -75,6 +78,37 @@
     where detect_id = #{detectId,jdbcType=INTEGER}
     GROUP BY c.customer_id
   </select>
+
+  <select id="getDetectByIdFast" resultType="ComplaintDetectInfo" parameterType="java.lang.Integer" >
+    select
+      detect_id detectId,
+      detect_product_number detectProductNumber,
+      detect_state detectState,
+      cd.customer_id customerId,
+      detect_phenomenon detectPhenomenon,
+      detect_classification detectClassification,
+      detect_failure_cause detectFailureCause,
+      detect_results detectResults,
+      detect_point detectPoint,
+      detect_nalysis detectNalysis,
+      detect_content detectContent,
+      detect_desc detectDesc,
+      detect_date detectDate,
+      detect_create_time detectCreateTime,
+      detect_update_time detectUpdateTime,
+      detect_offer detectOffer,
+      detect_renovation detectRenovation,
+      detect_processing_results detectProcessingResults,
+      detect_production detectProduction,
+      detect_fuselage_barcode detectFuselageBarcode,
+      detect_film_type detectFilmType,
+      detect_float_type detectFloatType,
+      detect_version_number detectVersionNumber,
+      detect_is_refurbishing detectIsRefurbishing
+    from tb_rst_complaint_detect cd
+    where detect_id = #{detectId,jdbcType=INTEGER}
+  </select>
+
   <select id="listComplaintDetect" resultType="ComplaintDetectInfo" parameterType="ComplaintDetectInfo" >
     select
     cd.detect_id detectId,

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedProductInfoMapper.xml

@@ -12,7 +12,6 @@
     <result column="signclosed_product_id" property="signclosedProductId" jdbcType="INTEGER" />
     <result column="signclosed_product_color" property="signclosedProductColor" jdbcType="INTEGER" />
     <result column="machine_no" property="machineNo" jdbcType="VARCHAR" />
-
   </resultMap>
   <sql id="Base_Column_List" >
     product_id, signclosed_id, product_name, product_num, signclosed_create_time,
@@ -38,7 +37,8 @@
 	sp.machine_no machineNo,
     pc.color_name colorName,
     pi.product_number productNumber,
-    pc.color_price colorPrice
+    pc.color_price colorPrice,
+    pc.color_bar colorBar
     from
     tb_rst_complaint_signclosed_product sp
     LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSignclosedController.java

@@ -187,7 +187,17 @@ public class AdminSignclosedController {
         }
         signclosedInfo.setSignclosedCreateTime(new Date());
         signclosedInfo.setSignclosedIsReceiving(2);
-        Integer num = complaintSignclosedInfoService.insert(signclosedInfo,orderItemString,componentsImgs);
+        Integer num = 0;
+        try{
+            num = complaintSignclosedInfoService.insert(signclosedInfo,orderItemString,componentsImgs);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        if(num < 1){
+            msg.setResultCode(500);
+            msg.setReturnCode(num);
+            return msg;
+        }
         msg.setResultCode(200);
         msg.setReturnCode(num);
         return msg;

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

@@ -33,13 +33,12 @@
             <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="手机号码" id="customerTel" name="customerTel">
             <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                 <option value="">处理结果</option>
-                <option value="1" >已解决</option>
-                <option value="2" >未解决</option>
-                <option value="3" >换新</option>
-                <option value="4" >维修</option>
+                <option value="1" >操作指导</option>
+                <option value="2" >换货</option>
+                <option value="3" >维修</option>
+                <option value="4" >退货</option>
                 <option value="5" >补发</option>
-                <option value="6" >退货</option>
-                <option value="7" >无理由退货</option>
+                <option value="6" >其他</option>
             </select>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;height: 35px;margin-bottom: 10px;"name="" onclick="searchOrder()"><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>

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

@@ -1093,9 +1093,9 @@
                     <div class="formControls col-12 col-sm-12">
                             <div class="row cl" >
                                 <div class="formControls col-2 col-sm-2 text-r">
-                                    <strong>检测ID：</strong>
+                                    <strong>维修编号：</strong>
                                 </div>
-                                <div class="formControls col-4 col-sm-4" id="detectIdDiv">
+                                <div class="formControls col-4 col-sm-4" id="detectNumberDiv">
 
                                 </div>
                                 <div class="formControls col-2 col-sm-2 text-r">
@@ -2773,7 +2773,7 @@
                     }else{
                         detectOfferName = "0元";
                     }
-                    $("#detectIdDiv").html("");
+                    $("#detectNumberDiv").html("");
                     $("#detectStateDIV").html("");
                     $("#productTypeNameDIV").html("");
                     $("#detectOfferDIV").html("");
@@ -2788,7 +2788,7 @@
                     $("#imgDiv").html();
 
 
-                    $("#detectIdDiv").html(detectInfo.detectId);
+                    $("#detectNumberDiv").html(detectInfo.detectNumber);
                     $("#detectStateDIV").html(detectStateName);
                     $("#productTypeNameDIV").html(detectInfo.productName+"("+detectInfo.colorName+")");
                     $("#detectOfferDIV").html(detectOfferName);

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/update_sender.ftl

@@ -50,13 +50,13 @@
                 <#--<label class="form-label col-3 col-sm-3" style="color: #0000cc;">现寄送信息</label>-->
             <#--</div>-->
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人姓名：</label>
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">寄件人姓名：</label>
                 <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
                     <input type="text" style="" value="${complaintSignclosedInfo.signclosedSendName!''}" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
                 </div>
             </div>
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人电话：</label>
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">寄件人电话：</label>
                 <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
                     <input type="text" style="" value="${complaintSignclosedInfo.signclosedSendTel!''}" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                 </div>
@@ -132,7 +132,7 @@
 
     function  update() {
         var signclosedSendName = $("#signclosedSendName").val();
-        if( signclosedSendName == null || signclosedSendName == "" ){
+        /*if( signclosedSendName == null || signclosedSendName == "" ){
             layer.msg('寄件人姓名不能为空',{icon: 5,time:1000});
             return;
         }
@@ -153,7 +153,7 @@
         if(!myreg.test(signclosedSendTel)){
             layer.msg('寄件人电话格式不正确',{icon: 5,time:1000});
             return;
-        }
+        }*/
         var signclosedLogisticsNumber = $("#signclosedLogisticsNumber").val();
         if( signclosedLogisticsNumber == null || signclosedLogisticsNumber == "" ){
             layer.msg('物流单号不能为空',{icon: 5,time:1000});

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

@@ -98,6 +98,7 @@
                             <tbody id="detect_product">
                             </tbody>
                         </table>
+                        <input type="hidden" value="" id="isdetectId">
                     </div>
                 </div>
             </div>

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

@@ -87,6 +87,13 @@ $(function(){
                 vailErrorMsg($(".add-order-button"),"必须要有一个产品");
                 return false;
             }
+            if($("#isdetectId").val() != ""){
+                if (!$("[name='detectId']").get(0).checked) {
+                    vailErrorMsg($(".add-order-button"),"维修类型的售后订单，如果有需要寄给用户的机器，请勾选维修记录");
+                    return false;
+                }
+            }
+
 
             $("#orderItemString").val(JSON.stringify(orderItemArray));
 
@@ -170,6 +177,7 @@ function setSelectCustomer(customerId){
                 //回显售后数据
                 var listDetet = data.returnMsg.listDetet;
                 if(listDetet.length > 0){
+                    $("#isdetectId").val(listDetet.length);
                     var html = "";
                     $("#all_detect_product").show();
                     for(var i=0;i<listDetet.length;i++){