Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/ConfigsController.java

@@ -8,9 +8,9 @@ import com.usoftchina.saas.commons.po.Configs;
 import com.usoftchina.saas.commons.service.ConfigsService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @author: guq
@@ -35,10 +35,15 @@ public class ConfigsController {
         return Result.success(data);
     }
 
-    @GetMapping("/save")
+    @PostMapping("/save")
     public Result<DocBaseDTO> save(Configs data) {
         DocBaseDTO baseDTO = configsService.save(data);
         return Result.success(baseDTO);
     }
 
+    @PostMapping("/update")
+    public Result update(@RequestBody List<Configs> data) {
+        configsService.update(data);
+        return Result.success();
+    }
 }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/ConfigsMapper.java

@@ -21,4 +21,6 @@ public interface ConfigsMapper {
     List<Configs> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
 
     void updateCreator(@Param("userId") Long userId, @Param("userName") String userName, @Param("id") Long id);
+
+    void updateByCodeSelective(Configs con);
 }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/ConfigsService.java

@@ -6,10 +6,14 @@ import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.po.Configs;
 import com.usoftchina.saas.page.PageRequest;
 
+import java.util.List;
+
 public interface ConfigsService {
     PageInfo getListData(PageRequest page, ListReqDTO req);
 
     Configs getConfigByCode(String code);
 
     DocBaseDTO save(Configs data);
+
+    void update(List<Configs> data);
 }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/ConfigsServiceImpl.java

@@ -6,14 +6,12 @@ import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.mapper.ConfigsMapper;
 import com.usoftchina.saas.commons.po.Configs;
-import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.commons.service.ConfigsService;
 import com.usoftchina.saas.commons.service.MessageLogService;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
-import com.usoftchina.saas.utils.BeanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -89,4 +87,15 @@ public class ConfigsServiceImpl implements ConfigsService{
         messageLogService.update(baseDTO);
         return baseDTO;
     }
+
+    @Override
+    public void update(List<Configs> data) {
+        if (StringUtils.isEmpty(data)) {
+            return;
+        }
+        for (Configs con : data) {
+            con.setCompanyId(BaseContextHolder.getCompanyId());
+            configsMapper.updateByCodeSelective(con);
+        }
+    }
 }

applications/commons/commons-server/src/main/resources/mapper/ConfigsMapper.xml

@@ -156,4 +156,29 @@
     update configs set creatorId = #{userId} , creatorName=#{userName} where id=#{id}
   </update>
 
+  <update id="updateByCodeSelective" parameterType="com.usoftchina.saas.commons.po.Configs" >
+    update configs
+    <set >
+      <if test="description != null" >
+        description = #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="data != null" >
+        data = #{data,jdbcType=VARCHAR},
+      </if>
+      <if test="creatorName != null" >
+        creatorName = #{creatorName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatorId != null" >
+        creatorId = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updaterName != null" >
+        updaterName = #{updaterName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where code = #{code,jdbcType=VARCHAR} and companyid = #{companyId}
+  </update>
+
 </mapper>

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -138,7 +138,7 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
      */
     public static Date string2Date(String dateStr, String format) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat(format);
-        if (dateStr == null) {
+        if (dateStr != null) {
             return sdf.parse(dateStr);
         }
         return null;

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerServiceImpl.java

@@ -493,10 +493,11 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
      */
     public static Date string2Date(String dateStr, String format) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat(format);
-        if (dateStr == null) {
+        if (dateStr != null) {
             return sdf.parse(dateStr);
+        }else {
+            return null;
         }
-        return null;
     }
 
     /**
@@ -510,8 +511,9 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         SimpleDateFormat sdf = new SimpleDateFormat(format);
         if (date != null) {
             return sdf.format(date);
+        }else {
+            return null;
         }
-        return null;
     }
 
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -432,7 +432,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
      */
     public static Date string2Date(String dateStr, String format) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat(format);
-        if (dateStr == null) {
+        if (dateStr != null) {
             return sdf.parse(dateStr);
         }
         return null;

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/PurchaseDetailDTO.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2018/10/9
  */
 @Data
-public class PurchaseDetailDTO implements Serializable{
+public class PurchaseDetailDTO extends CommonBaseDTO implements Serializable{
 
     private  Long pd_puid;
 

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/MakeServiceImpl.java

@@ -266,6 +266,13 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
     public void singleAudit(MakeListDTO makeListDTO) {
         //1.获取主从表数据
         Make make = makeListDTO.getMain();
+        //检验单审核状态
+        //检查审核状态
+        String ma_statuscode = make.getMa_statuscode();
+        if(StringUtils.isEmpty(ma_statuscode)||(!StringUtils.isEmpty(ma_statuscode)&&!ma_statuscode.equals(Status.UNAUDITED.name()))){
+            throw  new BizException(BizExceptionCode.BIZ_AUDITED);
+        };
+
         //2.校验库存是否足够
         validStorage(makeListDTO);
         //3.生成  完工入库单和领料单 并 过账
@@ -537,7 +544,6 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
                 prodIODetailList.add(prodIODetail);
             }
             prodIODetailMapper.batchInsert(prodIODetailList);
-
             map.put("inoutNo", code);
             map.put("class", "完工入库单");
             map.put("commitid", BaseContextHolder.getUserId());
@@ -551,10 +557,21 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public DocBaseDTO resAudit(Long id) {
+        return singleUnAudit(id);
+    }
+
+
+
+    @Transactional(propagation = Propagation.REQUIRED)
+    public DocBaseDTO singleUnAudit(Long id) {
         //1.获取主从表数据
         Make make = getMapper().selectByPrimaryKey(id);
+        //检查审核状态
+        String ma_statuscode = make.getMa_statuscode();
+        if(StringUtils.isEmpty(ma_statuscode)||(!StringUtils.isEmpty(ma_statuscode)&&!ma_statuscode.equals(Status.AUDITED.name()))){
+            throw  new BizException(BizExceptionCode.BIZ_UNAUDITED);
+        };
         List<MakeMaterial> items = makeMaterialMapper.selectByFK(id, BaseContextHolder.getCompanyId());
         MakeListDTO makeListDTO = new MakeListDTO(make, items);
         //2.校验库存是否足够
@@ -577,7 +594,23 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
     }
 
 
-
+    @Override
+    public String batchUnAudit(BatchDealBaseDTO baseDTOs) {
+        if (null == baseDTOs || null == baseDTOs.getBaseDTOs() ||
+                baseDTOs.getBaseDTOs().size() == 0) {
+            return "无可反审核单据。";
+        }
+        StringBuffer errorMsg = new StringBuffer();
+        for (DocBaseDTO base : baseDTOs.getBaseDTOs()) {
+            try {
+                Long id =  base.getId();
+                singleUnAudit(id);
+            }catch (Exception e) {
+                errorMsg.append("编号：" + base.getCode() + "处理失败," + e.getMessage());
+            }
+        }
+        return errorMsg.toString();
+    }
 
     @Override
     public String batchClose(BatchDealBaseDTO batchDealBaseDTO) {
@@ -618,27 +651,6 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
     }
 
 
-
-    @Override
-    public String batchUnAudit(BatchDealBaseDTO baseDTOs) {
-        if (null == baseDTOs || null == baseDTOs.getBaseDTOs() ||
-                baseDTOs.getBaseDTOs().size() == 0) {
-            return "无可反审核单据。";
-        }
-        StringBuffer errorMsg = new StringBuffer();
-        for (DocBaseDTO base : baseDTOs.getBaseDTOs()) {
-            try {
-                Long id =  base.getId();
-
-//                ProdInOutDTO prodInOutDTO = BeanMapper.map(prodInOut,ProdInOutDTO.class);
-//                singleUnAudit(prodInOutDTO);
-            }catch (Exception e) {
-                errorMsg.append("编号：" + base.getCode() + "处理失败," + e.getMessage());
-            }
-        }
-        return errorMsg.toString();
-    }
-
     /**
      * 1.查找制造单关联的出入库单据
      * 2.反过账

base-servers/auth/auth-common/src/main/java/com/usoftchina/saas/auth/common/cookie/CookieInfo.java

@@ -3,7 +3,6 @@ package com.usoftchina.saas.auth.common.cookie;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @author yingp
@@ -105,7 +104,7 @@ public class CookieInfo implements Serializable {
     /**
      * 上次登录时间
      */
-    private Date lastLoginTime;
+    private Long lastLoginTime;
 
     public Long getUserUU() {
         return userUU;
@@ -243,11 +242,11 @@ public class CookieInfo implements Serializable {
         this.appId = appId;
     }
 
-    public Date getLastLoginTime() {
+    public Long getLastLoginTime() {
         return lastLoginTime;
     }
 
-    public void setLastLoginTime(Date lastLoginTime) {
+    public void setLastLoginTime(Long lastLoginTime) {
         this.lastLoginTime = lastLoginTime;
     }
 

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -167,7 +167,8 @@ public class AuthController {
                 JwtInfo jwtInfo = new JwtInfo(appId, companyId, accountDTO.getId(), accountDTO.getUsername(), accountDTO.getRealname());
                 JwtToken jwtToken = JwtHelper.generateToken(jwtInfo, privateKeyPath, expire);
                 TokenDTO tokenDTO = BeanMapper.map(jwtToken, TokenDTO.class);
-                socketMessageApi.sendToClient(clientId, JsonUtils.toJsonString(new AuthDTO(tokenDTO, accountDTO)));
+                socketMessageApi.sendToClient(clientId, "/sso/callback",
+                        JsonUtils.toJsonString(new AuthDTO(tokenDTO, accountDTO)));
             }
             ServletErrorUtils.writeJsonPMessage(response, callback, true);
         }

base-servers/socket/socket-api/src/main/java/com/usoftchina/saas/socket/api/SocketMessageApi.java

@@ -15,18 +15,20 @@ public interface SocketMessageApi {
      * 发送信息给指定用户
      *
      * @param clientId
+     * @param dest
      * @param message
      * @return
      */
-    @PostMapping("/clients/{clientId}")
-    Result sendToClient(@PathVariable("clientId") String clientId, String message);
+    @PostMapping("/message/clients/{clientId}")
+    Result sendToClient(@PathVariable("clientId") String clientId, String dest, String message);
 
     /**
      * 广播信息
      *
+     * @param dest
      * @param message
      * @return
      */
-    @PostMapping("/clients")
-    Result sendToAllClients(String message);
+    @PostMapping("/message/clients")
+    Result sendToAllClients(String dest, String message);
 }

base-servers/socket/socket-server/src/main/java/com/usoftchina/saas/socket/controller/MessageController.java

@@ -17,27 +17,42 @@ public class MessageController {
     @Resource
     private SimpMessagingTemplate simpMessagingTemplate;
 
+    /**
+     * 发送信息给指定用户
+     *
+     * @param clientId
+     * @param dest
+     * @param message
+     * @return
+     */
     @PostMapping("/clients/{clientId}")
-    public Result sendToClient(@PathVariable String clientId, String message) {
+    public Result sendToClient(@PathVariable String clientId, String dest, String message) {
         /**
          * 前端使用
          * <pre>
-         *     stomp.subscribe('/clients/{clientId}/message', function(message){});
+         *     stomp.subscribe('/clients/{clientId}/{dest}', function(message){});
          * </pre>
          */
-        simpMessagingTemplate.convertAndSendToUser(clientId, "/message", message);
+        simpMessagingTemplate.convertAndSendToUser(clientId, dest, message);
         return Result.success();
     }
 
+    /**
+     * 广播信息
+     *
+     * @param dest
+     * @param message
+     * @return
+     */
     @PostMapping("/clients")
-    public Result sendToAllClients(String message) {
+    public Result sendToAllClients(String dest, String message) {
         /**
          * 前端使用
          * <pre>
-         *     stomp.subscribe('/clients/message', function(message){});
+         *     stomp.subscribe('/clients/{dest}', function(message){});
          * </pre>
          */
-        simpMessagingTemplate.convertAndSend("/message", message);
+        simpMessagingTemplate.convertAndSend(dest, message);
         return Result.success();
     }
 }

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -46,7 +46,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         readOnly:true,
         allowBlank : true, 
         columnWidth : 0.25
-    }, {
+    },{
         xtype : "hidden", 
         name : "pi_vendid", 
         fieldLabel : "供应商ID", 

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -62,10 +62,25 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         bind: '{pi_custcode}',
         fieldLabel: '客户编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'hidden',
         name: 'pi_custname',
         bind: '{pi_custname}',
         fieldLabel: '客户名称'
+    },{
+        xtype : "hidden", 
+        name : "pi_vendid", 
+        fieldLabel : "供应商ID", 
+        allowBlank : true, 
+        columnWidth : 0.0
+    },{
+        xtype: 'hidden',
+        name: 'pi_vendcode',
+        fieldLabel: '供应商编号'
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'pi_vendname',
+        fieldLabel: '供应商名称',
+        allowBlank : false,
     },{
         xtype : "datefield", 
         name : "pi_date", 

frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -9,6 +9,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+
                         dataUrl:'/api/document/vendor/list',
                         // dataUrl:'http://localhost:9480/vendor/list',
                         addXtype: 'document-vendor-formpanel',
@@ -315,10 +316,10 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             to: 'pd_whname'
                         }],
                         dbtpls: [{
-                            field: 'pd_whcode',
+                            field: 'wh_code',
                             width: 100
                         }, {
-                            field: 'pd_whname',
+                            field: 'wh_description',
                             width: 100
                         }],
                         dbSearchFields:[{

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -28,7 +28,21 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         fieldLabel: '单据日期',
         allowBlank: true,
         columnWidth: 0.5
+    },{
+        xtype: 'textfield',
+        name: 'pi_vendcode',
+        fieldLabel: '供应商编号',
+        allowBlank: true,
+        hidden:true,
+        columnWidth: 0.25
     }, {
+        xtype: 'dbfindtrigger',
+        name: 'pi_vendname',
+        fieldLabel: '供应商名称',
+        emptyText:'输入供应商编号或名称',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
         xtype: 'textfield',
         name: 'pi_custcode',
         fieldLabel: '客户编号',
@@ -41,6 +55,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         fieldLabel: '客户名称',
         emptyText:'输入客户编号或名称',
         allowBlank: true,
+        hidden:true,
         columnWidth: 0.25
     }, {
         xtype: 'textfield',
@@ -113,8 +128,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             dataIndex: 'pi_status',
             width: 120
         },{
-            text: '客户名称',
-            dataIndex: 'pi_custname',
+            text: '供应商名称',
+            dataIndex: 'pi_vendname',
             width: 120
         },{
             text: '制单人',
@@ -142,6 +157,11 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             text: '单据类型',
             dataIndex: 'pd_piclass',
             width: 200
+        },{
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            xtype:'datecolumn',
+            width: 200
         },{
             text: '审核状态',
             dataIndex: 'pi_status',
@@ -149,10 +169,11 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         },{
             text: '客户编号',
             dataIndex: 'pi_custcode',
+            hidden:true,
             width: 120
         },{
-            text: '客户名称',
-            dataIndex: 'pi_custname',
+            text: '供应商名称',
+            dataIndex: 'pi_vendname',
             width: 120
         },{
             text: '物料编号',
@@ -180,9 +201,15 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             dataIndex: 'pd_whname',
             width: 120
         },{
-            text: '单位成本',
+            text: '单价',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },            
             width: 120
         },{
             text: '税率',
@@ -193,6 +220,12 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },            
             width: 120
         },{
             text: '相关单号',

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -63,6 +63,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         xtype: 'dbfindtrigger',
         name: 'pi_custname',
         bind: '{pi_custname}',
+        allowBlank : false,
         fieldLabel: '客户名称'
     }, {
         xtype: "datefield",

frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -304,9 +304,9 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             from:'wh_description',to:'pd_whname'
                         }],
                         dbtpls:[{
-                            field:'pd_whcode',width:100
+                            field:'wh_code',width:100
                         },{
-                            field:'pd_whname',width:100
+                            field:'wh_description',width:100
                         }],
                         dbSearchFields:[{
                             emptyText:'输入仓库编号或名称',

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -139,6 +139,11 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             text: '单据类型',
             dataIndex: 'pd_piclass',
             width: 200
+        },{
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            xtype:'datecolumn',
+            width: 200
         },{
             text: '审核状态',
             dataIndex: 'pi_status',
@@ -177,9 +182,15 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             dataIndex: 'pd_whname',
             width: 120
         },{
-            text: '单位成本',
+            text: '单价',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },             
             width: 120
         },{
             text: '税率',
@@ -190,6 +201,12 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },            
             width: 120
         },{
             text: '相关单号',