1.采购验退单界面js

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/ProdInOutController.java

@@ -108,6 +108,17 @@ public class ProdInOutController {
         return Result.success(audit);
     }
 
+    /**
+     * 出入库单审批
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/unAudit/{id}")
+    public Result unAudit(@PathVariable("id") Long id) {
+        prodInOutService.unAudit(id);
+        return Result.success();
+    }
 
 
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/ProdInOutMapper.java

@@ -12,7 +12,7 @@ public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
 
     int deleteByExample(ProdInOutExample example);
 
-    int deleteByPrimaryKey(Integer pi_id);
+    int deleteByPrimaryKey(Long pi_id);
 
     int insert(ProdInOut record);
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/ProdInOutService.java

@@ -39,8 +39,18 @@ public interface ProdInOutService extends CommonBaseService<ProdInOutMapper, Pro
      */
     void delete(Long id);
 
+    /**
+     * 审核出入库单
+     * @param formData
+     * @return
+     */
     DocSavedDTO audit(ProdInOutFormDTO formData);
 
+    /**
+     * 反审核出入库单
+     * @param id
+     */
+    void unAudit(Long id);
 
     void deleteItem(Long id);
 
@@ -48,4 +58,5 @@ public interface ProdInOutService extends CommonBaseService<ProdInOutMapper, Pro
 
     Result turnProdOut(Long id);
 
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -207,6 +207,13 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         return savedDTO;
     }
 
+    @Override
+    public void unAudit(Long id) {
+        ProdInOut prodInOut = getMapper().selectByPrimaryKey(id);
+        ProdInOutDTO prodInOutDTO = BeanMapper.map(prodInOut,ProdInOutDTO.class);
+        singleAudit(prodInOutDTO);
+    }
+
     private void singleAudit(ProdInOutDTO prodInOutDTO) {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("inoutNo",prodInOutDTO.getPi_inoutno() );

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -141,7 +141,7 @@
     from prodinout
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from prodinout
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </delete>

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -5,12 +5,12 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     controller: 'purchase-purchaseOut-queryformcontroller',
     viewModel: 'purchase-purchaseOut-queryformmodel',
     _baseVastUrl:'http://192.168.253.58:8800/purchase/',
-    _idField:'pi_id',
+    _idField:'id',
     _codeField:'pi_inoutno',
     queryFormItems: [{
         xtype: 'hidden',
-        name: 'pi_id',
-        bind: '{pi_id}',
+        name: 'id',
+        bind: '{id}',
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
@@ -111,7 +111,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             xtype: 'rownumberer'
         }, {
             text: 'id',
-            dataIndex: 'pi_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {