1. 【新增】售后单售后原因类型支持搜索

2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题

app/purchase/model/po.php

@@ -1128,6 +1128,8 @@ class purchase_mdl_po extends dbeav_model{
                         "*:条形码" => mb_convert_encoding($item['barcode'], 'GBK', 'UTF-8'),
                         "*:数量" => $item['num'],
                         "*:已入库数量" => $item['in_num'],
+                        "*:入库取消" => $item['out_num'],
+                        "*:不良品" => $item['defective_num'],
                         "*:价格" => $item['price'],
                 );
                 $data[$row_num] = implode(',', $temp_row);
@@ -1143,6 +1145,8 @@ class purchase_mdl_po extends dbeav_model{
                     '*:条形码',
                     '*:数量',
                     '*:已入库数量',
+                    '*:入库取消',
+                    '*:不良品',
                     '*:价格',
             );
             foreach ((array)$title as $key => $value) {

app/purchase/model/supplier/goods.php

@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
-
 /**
-     * CSV导入
-     */
-class purchase_mdl_supplier_goods extends dbeav_model {
+ * 供应商商品
+ */
 
+class purchase_mdl_supplier_goods extends dbeav_model{
+    
+    /*
+     * 获取供应商商品列表
+     */
     function getSupplierGoods($supplier_id=null){
         
         $filter = array("supplier_id"=>$supplier_id);
@@ -43,10 +44,6 @@ class purchase_mdl_supplier_goods extends dbeav_model {
         return $base_filter;
     }
     
-    /**
-     * 搜索Options
-     * @return mixed 返回值
-     */
     public function searchOptions()
     {
         return array(
@@ -55,13 +52,6 @@ class purchase_mdl_supplier_goods extends dbeav_model {
         );
     }
     
-    /**
-     * _filter
-     * @param mixed $filter filter
-     * @param mixed $tableAlias tableAlias
-     * @param mixed $baseWhere baseWhere
-     * @return mixed 返回值
-     */
     public function _filter($filter,$tableAlias=null,$baseWhere=null)
     {
         $where = ' 1 ';
@@ -157,7 +147,7 @@ class purchase_mdl_supplier_goods extends dbeav_model {
         
         foreach($pSdf as $v){
             $queueData = array(
-                    'queue_title'=>'供应商货品导入',
+                    'queue_title'=>'供应商基础物料导入',
                     'start_time'=>time(),
                     'params'=>array(
                             'sdfdata'=>$v,
@@ -228,7 +218,7 @@ class purchase_mdl_supplier_goods extends dbeav_model {
                 $tempData    = $this->dump(array('supplier_id'=>$sdfRow['supplier_id'], 'bm_id'=>$sdfRow['bm_id']), '*');
                 if($tempData)
                 {
-                    $msg['error'] = '供应商货品关系已经存在，不能重复导入!';
+                    $msg['error'] = '供应商基础物料关系已经存在，不能重复导入!';
                     return false;
                 }
                 
@@ -245,4 +235,4 @@ class purchase_mdl_supplier_goods extends dbeav_model {
         return null;
     }
 }
-?>
+?>